From 2a44228b987f0e8b1ffd3e293d45ba084bfe4790 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 7 May 2013 21:31:26 +0200
Subject: [PATCH] Consistent use of <pre class="code">

Issue: SPR-8108
---
 .../org/springframework/build/gradle/MergePlugin.groovy     | 2 +-
 .../GenericInterfaceDrivenDependencyInjectionAspect.aj      | 2 +-
 .../java/org/springframework/beans/ExtendedBeanInfo.java    | 4 ++--
 .../mail/javamail/ConfigurableMimeFileTypeMap.java          | 2 +-
 .../config/AnnotationDrivenCacheBeanDefinitionParser.java   | 5 +----
 .../context/support/GenericApplicationContext.java          | 2 +-
 .../instrument/classloading/jboss/JBossLoadTimeWeaver.java  | 2 +-
 .../org/springframework/jndi/JndiObjectTargetSource.java    | 2 +-
 .../src/main/java/org/springframework/asm/Handle.java       | 2 +-
 .../main/java/org/springframework/asm/MethodVisitor.java    | 2 +-
 .../java/org/springframework/core/GenericTypeResolver.java  | 2 +-
 .../main/java/org/springframework/core/env/Environment.java | 2 +-
 .../io/support/PathMatchingResourcePatternResolver.java     | 6 +++---
 .../src/main/java/org/springframework/util/StringUtils.java | 4 ++--
 .../org/springframework/expression/ExpressionParser.java    | 4 ++--
 .../java/org/springframework/expression/ParserContext.java  | 2 +-
 .../org/springframework/expression/spel/SpelMessage.java    | 2 +-
 .../jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java   | 2 +-
 .../datasource/lookup/IsolationLevelDataSourceRouter.java   | 6 +++---
 .../orm/hibernate3/FilterDefinitionFactoryBean.java         | 2 +-
 .../orm/hibernate3/HibernateInterceptor.java                | 2 +-
 .../orm/hibernate3/LocalSessionFactoryBean.java             | 4 ++--
 .../springframework/orm/hibernate3/TypeDefinitionBean.java  | 2 +-
 .../orm/hibernate3/support/ScopedBeanInterceptor.java       | 2 +-
 .../orm/jdo/LocalPersistenceManagerFactoryBean.java         | 2 +-
 .../test/web/client/MockRestServiceServer.java              | 2 +-
 .../java/org/springframework/test/web/servlet/MockMvc.java  | 2 +-
 .../org/springframework/test/web/servlet/ResultActions.java | 4 ++--
 .../org/springframework/test/web/servlet/ResultHandler.java | 2 +-
 .../org/springframework/test/web/servlet/ResultMatcher.java | 2 +-
 .../test/web/servlet/request/MockMvcRequestBuilders.java    | 4 ++--
 .../test/web/servlet/result/ContentResultMatchers.java      | 2 +-
 .../java/org/springframework/test/context/TestContext.java  | 2 +-
 .../java/org/springframework/test/util/AssertionErrors.java | 6 +++---
 .../http/converter/ObjectToStringHttpMessageConverter.java  | 2 +-
 .../converter/json/Jackson2ObjectMapperFactoryBean.java     | 6 +++---
 .../http/converter/json/JacksonObjectMapperFactoryBean.java | 6 +++---
 .../converter/json/MappingJackson2HttpMessageConverter.java | 2 +-
 .../converter/json/MappingJacksonHttpMessageConverter.java  | 2 +-
 .../springframework/web/bind/annotation/RequestMapping.java | 6 +++---
 .../java/org/springframework/web/client/RestTemplate.java   | 6 +++---
 .../web/jsf/DelegatingNavigationHandlerProxy.java           | 4 ++--
 .../web/jsf/el/SpringBeanFacesELResolver.java               | 6 +++---
 .../web/jsf/el/WebApplicationContextFacesELResolver.java    | 2 +-
 .../org/springframework/web/util/UriComponentsBuilder.java  | 6 +++---
 .../main/java/org/springframework/web/util/UriUtils.java    | 4 ++--
 .../web/portlet/handler/PortletModeHandlerMapping.java      | 2 +-
 .../web/portlet/mvc/PortletWrappingController.java          | 2 +-
 .../web/servlet/view/tiles3/TilesConfigurer.java            | 2 +-
 .../web/servlet/mvc/ServletForwardingController.java        | 4 ++--
 .../web/servlet/mvc/ServletWrappingController.java          | 2 +-
 .../web/servlet/mvc/support/RedirectAttributes.java         | 2 +-
 .../java/org/springframework/web/servlet/tags/UrlTag.java   | 2 +-
 .../web/servlet/view/freemarker/FreeMarkerConfigurer.java   | 4 ++--
 .../view/jasperreports/JasperReportsMultiFormatView.java    | 2 +-
 .../web/servlet/view/json/MappingJackson2JsonView.java      | 2 +-
 .../web/servlet/view/json/MappingJacksonJsonView.java       | 2 +-
 .../web/servlet/view/tiles2/TilesConfigurer.java            | 2 +-
 .../org/springframework/web/socket/WebSocketSession.java    | 2 +-
 59 files changed, 87 insertions(+), 90 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
index 4143780702b6..27afc24b7c3b 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
@@ -34,7 +34,7 @@ import org.gradle.api.invocation.*
  * dependencies (for example Hibernate v3 and v4).
  * <p>
  * The 'merge' extension should be used to define how projects are merged, for example:
- * <pre>
+ * <pre class="code">
  * configure(subprojects) {
  *     apply plugin: MergePlugin
  * }
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 b4a3d93d1d3a..8a1beb8a8964 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
@@ -23,7 +23,7 @@ package org.springframework.beans.factory.aspectj;
  *
  * The subaspect of this aspect doesn't need to include any AOP constructs.
  * For example, here is a subaspect that configures the {@code PricingStrategyClient} objects.
- * <pre>
+ * <pre class="code">
  * aspect PricingStrategyDependencyInjectionAspect
  *        extends GenericInterfaceDrivenDependencyInjectionAspect<PricingStrategyClient> {
  *     private PricingStrategy pricingStrategy;
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 6606741ee4e0..f89350cfe49f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
@@ -44,7 +44,7 @@
  * Decorator for a standard {@link BeanInfo} object, e.g. as created by
  * {@link Introspector#getBeanInfo(Class)}, designed to discover and register static
  * and/or non-void returning setter methods. For example:
- * <pre>{@code
+ * <pre class="code">
  * public class Bean {
  *     private Foo foo;
  *
@@ -56,7 +56,7 @@
  *         this.foo = foo;
  *         return this;
  *     }
- * }}</pre>
+ * }</pre>
  * The standard JavaBeans {@code Introspector} will discover the {@code getFoo} read
  * method, but will bypass the {@code #setFoo(Foo)} write method, because its non-void
  * returning signature does not comply with the JavaBeans specification.
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 ac683c5243b1..a5f406281021 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
@@ -34,7 +34,7 @@
  * <p>The mapping file should be in the following format, as specified by the
  * Java Activation Framework:
  *
- * <pre>
+ * <pre class="code">
  * # map text/html to .htm and .html files
  * text/html  html htm HTML HTM</pre>
  *
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 8c0fb757bef7..0b15856df325 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
@@ -74,15 +74,12 @@ private static void parseCacheManagerProperty(Element element, BeanDefinition de
 
 	/**
 	 * Registers a
-	 * <pre>
+	 * <pre class="code">
 	 * <bean id="cacheAspect" class="org.springframework.cache.aspectj.AnnotationCacheAspect" factory-method="aspectOf">
 	 *   <property name="cacheManager" ref="cacheManager"/>
 	 *   <property name="keyGenerator" ref="keyGenerator"/>
 	 * </bean>
-	 *
 	 * </pre>
-	 * @param element
-	 * @param parserContext
 	 */
 	private void registerCacheAspect(Element element, ParserContext parserContext) {
 		if (!parserContext.getRegistry().containsBeanDefinition(CACHE_ASPECT_BEAN_NAME)) {
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 7c3d8bcc1142..8c1efa7becee 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
@@ -54,7 +54,7 @@
  *
  * <p>Usage example:
  *
- * <pre>
+ * <pre class="code">
  * GenericApplicationContext ctx = new GenericApplicationContext();
  * XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx);
  * xmlReader.loadBeanDefinitions(new ClassPathResource("applicationContext.xml"));
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 260d1d48851f..6d4d4bce0b94 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
@@ -31,7 +31,7 @@
  * <p><b>NOTE:</b> On JBoss 6.0, to avoid the container loading the classes before the
  * application actually starts, one needs to add a <tt>WEB-INF/jboss-scanning.xml</tt>
  * file to the application archive - with the following content:
- * <pre>&lt;scanning xmlns="urn:jboss:scanning:1.0"/&gt;</pre>
+ * <pre class="code">&lt;scanning xmlns="urn:jboss:scanning:1.0"/&gt;</pre>
  *
  * <p>Thanks to Ales Justin and Marius Bogoevici for the initial prototype.
  *
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 5a9bb616b185..25f742de17b6 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
@@ -31,7 +31,7 @@
  *
  * <p>Example:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="queueConnectionFactoryTarget" class="org.springframework.jndi.JndiObjectTargetSource"&gt;
  *   &lt;property name="jndiName" value="JmsQueueConnectionFactory"/&gt;
  *   &lt;property name="lookupOnStartup" value="false"/&gt;
diff --git a/spring-core/src/main/java/org/springframework/asm/Handle.java b/spring-core/src/main/java/org/springframework/asm/Handle.java
index bd82d46c10b0..8c22338524af 100644
--- a/spring-core/src/main/java/org/springframework/asm/Handle.java
+++ b/spring-core/src/main/java/org/springframework/asm/Handle.java
@@ -154,7 +154,7 @@ public int hashCode() {
      * Returns the textual representation of this handle. The textual
      * representation is:
      * 
-     * <pre>
+     * <pre class="code">
      * owner '.' name desc ' ' '(' tag ')'
      * </pre>
      * 
diff --git a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
index e0c215e8c831..4dabda69599e 100644
--- a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
@@ -449,7 +449,7 @@ public void visitLabel(Label label) {
      * constant types, implementations of this method should check for
      * unexpected constant types, like this:
      * 
-     * <pre>
+     * <pre class="code">
      * if (cst instanceof Integer) {
      *     // ...
      * } else if (cst instanceof Float) {
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 7d8045b51ba6..3ddd29423644 100644
--- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
@@ -111,7 +111,7 @@ public static Class<?> resolveReturnType(Method method, Class<?> clazz) {
 	 * method for {@code creatProxy()} and an {@code Object[]} array containing
 	 * {@code MyService.class}, {@code resolveReturnTypeForGenericMethod()} will
 	 * infer that the target return type is {@code MyService}.
-	 * <pre>{@code public static <T> T createProxy(Class<T> clazz)}</pre>
+	 * <pre class="code">{@code public static <T> T createProxy(Class<T> clazz)}</pre>
 	 * <h4>Possible Return Values</h4>
 	 * <ul>
 	 * <li>the target return type, if it can be inferred</li>
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 3f9ee725e20c..37e1f17b9158 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
@@ -102,7 +102,7 @@ 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, <pre>env.acceptsProfiles("p1", "!p2")</pre> will return true if profile
+	 * example, <pre class="code">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
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 89e8b69be48b..ec6dd4120299 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
@@ -72,7 +72,7 @@
  * <p><b>Ant-style Patterns:</b>
  *
  * <p>When the path location contains an Ant-style pattern, e.g.:
- * <pre>
+ * <pre class="code">
  * /WEB-INF/*-context.xml
  * com/mycompany/**&#47;applicationContext.xml
  * file:C:/some/path/*-context.xml
@@ -143,9 +143,9 @@
  *
  * <p><b>WARNING:</b> Ant-style patterns with "classpath:" resources are not
  * guaranteed to find matching resources if the root package to search is available
- * in multiple class path locations. This is because a resource such as<pre>
+ * in multiple class path locations. This is because a resource such as<pre class="code">
  *     com/mycompany/package1/service-context.xml
- * </pre>may be in only one location, but when a path such as<pre>
+ * </pre>may be in only one location, but when a path such as<pre class="code">
  *     classpath:com/mycompany/**&#47;service-context.xml
  * </pre>is used to try to resolve it, the resolver will work off the (first) URL
  * returned by {@code getResource("com/mycompany");}. If this base package
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 7fa4b75cf9d7..0b9a65d4dcfa 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -87,7 +87,7 @@ public static boolean isEmpty(Object str) {
 	/**
 	 * Check that the given CharSequence is neither {@code null} nor of length 0.
 	 * Note: Will return {@code true} for a CharSequence that purely consists of whitespace.
-	 * <p><pre>
+	 * <p><pre class="code">
 	 * StringUtils.hasLength(null) = false
 	 * StringUtils.hasLength("") = false
 	 * StringUtils.hasLength(" ") = true
@@ -116,7 +116,7 @@ public static boolean hasLength(String str) {
 	 * Check whether the given CharSequence has actual text.
 	 * More specifically, returns {@code true} if the string not {@code null},
 	 * its length is greater than 0, and it contains at least one non-whitespace character.
-	 * <p><pre>
+	 * <p><pre class="code">
 	 * StringUtils.hasText(null) = false
 	 * StringUtils.hasText("") = false
 	 * StringUtils.hasText(" ") = false
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
index 913749a0f99e..9f4cd288b570 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
@@ -29,7 +29,7 @@ public interface ExpressionParser {
 	/**
 	 * Parse the expression string and return an Expression object you can use for repeated evaluation.
 	 * <p>Some examples:
-	 * <pre>
+	 * <pre class="code">
 	 *     3 + 4
 	 *     name.firstName
 	 * </pre>
@@ -42,7 +42,7 @@ public interface ExpressionParser {
 	/**
 	 * Parse the expression string and return an Expression object you can use for repeated evaluation.
 	 * <p>Some examples:
-	 * <pre>
+	 * <pre class="code">
 	 *     3 + 4
 	 *     name.firstName
 	 * </pre>
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 a1ae657bc3d0..0fa439dd8d80 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
@@ -29,7 +29,7 @@ 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>
+	 * <pre class="code">
 	 * 	   Some literal text
 	 *     Hello #{name.firstName}!
 	 *     #{3 + 4}
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 3f89bed5121c..c6d95a941399 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
@@ -25,7 +25,7 @@
  * <p>
  * When a message is formatted, it will have this kind of form
  *
- * <pre>
+ * <pre class="code">
  * EL1004E: (pos 34): Type cannot be found 'String'
  * </pre>
  *
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 82b0a31c3b5c..895a719dd5fd 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
@@ -24,7 +24,7 @@
  * A builder that provides a convenient API for constructing an embedded database.
  *
  * <p>Usage example:
- * <pre>
+ * <pre class="code">
  * EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
  * EmbeddedDatabase db = builder.setType(H2).addScript("schema.sql").addScript("data.sql").build();
  * db.shutdown();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
index f194ca562669..63bb1b66f93b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
@@ -41,7 +41,7 @@
  * DataSources are defined as individual Spring beans with names
  * "myRepeatableReadDataSource", "mySerializableDataSource" and "myDefaultDataSource":
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="dataSourceRouter" class="org.springframework.jdbc.datasource.lookup.IsolationLevelDataSourceRouter"&gt;
  *   &lt;property name="targetDataSources"&gt;
  *     &lt;map&gt;
@@ -57,7 +57,7 @@
  * names for a standard JNDI lookup. This allows for a single concise definition
  * without the need for separate DataSource bean definitions.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="dataSourceRouter" class="org.springframework.jdbc.datasource.lookup.IsolationLevelDataSourceRouter"&gt;
  *   &lt;property name="targetDataSources"&gt;
  *     &lt;map&gt;
@@ -74,7 +74,7 @@
  * (By default, JtaTransactionManager will only accept a default isolation level
  * because of the lack of isolation level support in standard JTA itself.)
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"&gt;
  *   &lt;property name="allowCustomIsolationLevels" value="true"/&gt;
  * &lt;/bean&gt;</pre>
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 b5ac8cd7ea02..e445a51f154e 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
@@ -35,7 +35,7 @@
  * definition, as the list element for the "filterDefinitions" bean property.
  * For example:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"&gt;
  *   ...
  *   &lt;property name="filterDefinitions"&gt;
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 79339de558fa..a7faee60a093 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
@@ -36,7 +36,7 @@
  * Hibernate's own {@code SessionFactory.getCurrentSession()} method, to be
  * able to detect a thread-bound Session. Typically, the code will look like as follows:
  *
- * <pre>
+ * <pre class="code">
  * public void doSomeDataAccessAction() {
  *   Session session = this.sessionFactory.getCurrentSession();
  *   ...
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 d0308a1ee7c5..eb1fc0103e89 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
@@ -445,7 +445,7 @@ public void setFilterDefinitions(FilterDefinition[] filterDefinitions) {
 	 * This configuration setting corresponds to the &lt;class-cache&gt; entry
 	 * in the "hibernate.cfg.xml" configuration format.
 	 * <p>For example:
-	 * <pre>
+	 * <pre class="code">
 	 * &lt;property name="entityCacheStrategies"&gt;
 	 *   &lt;props&gt;
 	 *     &lt;prop key="com.mycompany.Customer"&gt;read-write&lt;/prop&gt;
@@ -465,7 +465,7 @@ public void setEntityCacheStrategies(Properties entityCacheStrategies) {
 	 * This configuration setting corresponds to the &lt;collection-cache&gt; entry
 	 * in the "hibernate.cfg.xml" configuration format.
 	 * <p>For example:
-	 * <pre>
+	 * <pre class="code">
 	 * &lt;property name="collectionCacheStrategies"&gt;
 	 *   &lt;props&gt;
 	 *     &lt;prop key="com.mycompany.Order.items">read-write&lt;/prop&gt;
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 475fe463af54..d478d6aa9795 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
@@ -28,7 +28,7 @@
  * definition, as list element for the "typeDefinitions" bean property.
  * For example:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"&gt;
  *   ...
  *   &lt;property name="typeDefinitions"&gt;
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 fa867d2054e9..a189463f2dad 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
@@ -30,7 +30,7 @@
  *
  * <p>Usage example:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id=&quot;sessionFactory&quot; class=&quot;org.springframework.orm.hibernate3.LocalSessionFactoryBean&quot;&gt;
  *   ...
  *   &lt;property name=&quot;entityInterceptor&quot;&gt;
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 53b92dd16cfc..a4e2817adae0 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
@@ -81,7 +81,7 @@
  *
  * <p>For example, in case of <a href="http://www.jpox.org">JPOX</a>:
  *
- * <p><pre>
+ * <p><pre class="code">
  * &lt;bean id="persistenceManagerFactory" class="org.jpox.PersistenceManagerFactoryImpl" destroy-method="close"&gt;
  *   &lt;property name="connectionFactory" ref="dataSource"/&gt;
  *   &lt;property name="nontransactionalRead" value="true"/&gt;
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 4d708ddd185c..2ec087180166 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
@@ -39,7 +39,7 @@
  * actual running server.
  *
  * <p>Below is an example:
- * <pre>
+ * <pre class="code">
  * RestTemplate restTemplate = new RestTemplate()
  * MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate);
  *
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 b18fc3554fa9..a163c967215e 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
@@ -32,7 +32,7 @@
  *
  * <p>Below is an example:
  *
- * <pre>
+ * <pre class="code">
  * static imports:
  * MockMvcBuilders.*, MockMvcRequestBuilders.*, MockMvcResultMatchers.*
  *
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index d94e8c7a1569..903f4011d5ab 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -31,7 +31,7 @@ public interface ResultActions {
 
 	/**
 	 * Provide an expectation. For example:
-	 * <pre>
+	 * <pre class="code">
 	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
 	 * mockMvc.perform(get("/person/1"))
@@ -52,7 +52,7 @@ public interface ResultActions {
 
 	/**
 	 * Provide a general action. For example:
-	 * <pre>
+	 * <pre class="code">
 	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
 	 * mockMvc.perform(get("/form")).andDo(print());
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
index b0ab9ca902d5..1f5ee35b6ec7 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
@@ -25,7 +25,7 @@
  *
  * <p>Example:
  *
- * <pre>
+ * <pre class="code">
  * static imports: MockMvcRequestBuilders.*, MockMvcResultHandlers.*
  *
  * mockMvc.perform(get("/form")).andDo(print());
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 98e3734d5696..cc73bcc395e3 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -24,7 +24,7 @@
  *
  * <p>Example:
  *
- * <pre>
+ * <pre class="code">
  * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
  *
  * mockMvc.perform(get("/form"))
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 bb0c109a0996..409359c2c7a9 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
@@ -117,14 +117,14 @@ public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTempla
 	 * {@link MvcResult} of the request that started async processing.
 	 *
 	 * <p>Usage involves performing one request first that starts async processing:
-	 * <pre>
+	 * <pre class="code">
 	 * MvcResult mvcResult = this.mockMvc.perform(get("/1"))
 	 *	.andExpect(request().asyncStarted())
 	 *	.andReturn();
 	 *  </pre>
 	 *
 	 * <p>And then performing the async dispatch re-using the {@code MvcResult}:
-	 * <pre>
+	 * <pre class="code">
 	 * this.mockMvc.perform(asyncDispatch(mvcResult))
 	 * 	.andExpect(status().isOk())
 	 * 	.andExpect(content().contentType(MediaType.APPLICATION_JSON))
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 c71dc98b7fd2..3368ffbeddef 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
@@ -117,7 +117,7 @@ public void match(MvcResult result) {
 
 	/**
 	 * Assert the response body content with a Hamcrest {@link Matcher}.
-	 * <pre>
+	 * <pre class="code">
 	 * mockMvc.perform(get("/path"))
 	 *   .andExpect(content(containsString("text")));
 	 * </pre>
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 63d1de2863b3..79ad66b4ec07 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
@@ -32,7 +32,7 @@
  * agnostic of the actual testing framework in use.
  *
  * @author Sam Brannen
- * @author Juergen Hoeller
+ * @author Juergen Hoellereasymock
  * @since 2.5
  */
 public class TestContext extends AttributeAccessorSupport {
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 4f2dbab7f8ce..0302686b2dba 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
@@ -44,11 +44,11 @@ public static void fail(String message) {
 	 * values to be added to the message.
 	 *
 	 * <p>For example given:
-	 * <pre>
+	 * <pre class="code">
 	 * assertEquals("Response header [" + name + "]", actual, expected);
 	 * </pre>
 	 * <p>The resulting message is:
-	 * <pre>
+	 * <pre class="code">
 	 * Response header [Accept] expected:&lt;application/json&gt; but was:&lt;text/plain&gt;
 	 * </pre>
 	 *
@@ -76,7 +76,7 @@ public static void assertTrue(String message, boolean condition) {
 	/**
 	 * Assert two objects are equal raise an {@link AssertionError} if not.
 	 * <p>For example:
-	 * <pre>
+	 * <pre class="code">
 	 * assertEquals("Response header [" + name + "]", actual, expected);
 	 * </pre>
 	 *
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
index 5f203bd3c07c..c1ef5c26dc3a 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
@@ -35,7 +35,7 @@
  * {@link #setSupportedMediaTypes supportedMediaTypes} property.
  * Example of usage:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.http.converter.ObjectToStringHttpMessageConverter">
  *   &lt;constructor-arg>
  *     &lt;bean class="org.springframework.context.support.ConversionServiceFactoryBean"/>
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 bc0e428160fa..50be04923e27 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
@@ -45,7 +45,7 @@
  * <p>Example usage with
  * {@link org.springframework.http.converter.json.MappingJackson2HttpMessageConverter}:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
  *   &lt;property name="objectMapper">
  *     &lt;bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean"
@@ -58,7 +58,7 @@
  *
  * <p>Example usage with MappingJackson2JsonView:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
  *   &lt;property name="objectMapper">
  *     &lt;bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean"
@@ -78,7 +78,7 @@
  * options), you can still use the more general methods
  * {@link #setFeaturesToEnable(Object[])} and {@link #setFeaturesToDisable(Object[])}.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean">
  *   &lt;property name="featuresToEnable">
  *     &lt;array>
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 2f07e7748067..451d11d2601f 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
@@ -36,7 +36,7 @@
  * to enable or disable Jackson features from within XML configuration.
  *
  * <p>Example usage with MappingJacksonHttpMessageConverter:
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
  * 	&lt;property name="objectMapper">
  * 		&lt;bean class="org.springframework.web.context.support.JacksonObjectMapperFactoryBean"
@@ -48,7 +48,7 @@
  * </pre>
  *
  * <p>Example usage with MappingJacksonJsonView:
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
  * 	&lt;property name="objectMapper">
  * 		&lt;bean class="org.springframework.web.context.support.JacksonObjectMapperFactoryBean"
@@ -63,7 +63,7 @@
  * options), you can still use the more general methods
  * {@link #setFeaturesToEnable(Object[])} and {@link #setFeaturesToDisable(Object[])}.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.web.context.support.JacksonObjectMapperFactoryBean">
  * 	&lt;property name="featuresToEnable">
  * 		&lt;array>
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 e0b9c1dbe042..0cd9462e84b7 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
@@ -111,7 +111,7 @@ public void setPrefixJson(boolean prefixJson) {
 	/**
 	 * Whether to use the {@link DefaultPrettyPrinter} when writing JSON.
 	 * This is a shortcut for setting up an {@code ObjectMapper} as follows:
-	 * <pre>
+	 * <pre class="code">
 	 * ObjectMapper mapper = new ObjectMapper();
 	 * mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
 	 * converter.setObjectMapper(mapper);
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 0a3314540467..e0a50b80818a 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
@@ -109,7 +109,7 @@ public void setPrefixJson(boolean prefixJson) {
 	/**
 	 * Whether to use the {@link org.codehaus.jackson.util.DefaultPrettyPrinter} when writing JSON.
 	 * This is a shortcut for setting up an {@code ObjectMapper} as follows:
-	 * <pre>
+	 * <pre class="code">
 	 * ObjectMapper mapper = new ObjectMapper();
 	 * mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
 	 * converter.setObjectMapper(mapper);
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 320bb95d1335..c15dc17edfdf 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
@@ -321,7 +321,7 @@
 	 * specified header is <i>not</i> supposed to be present in the request.
 	 * <p>Also supports media type wildcards (*), for headers such as Accept
 	 * and Content-Type. For instance,
-	 * <pre>
+	 * <pre class="code">
 	 * &#064;RequestMapping(value = "/something", headers = "content-type=text/*")
 	 * </pre>
 	 * will match requests with a Content-Type of "text/html", "text/plain", etc.
@@ -340,7 +340,7 @@
 	 * <p>The format is a single media type or a sequence of media types,
 	 * with a request only mapped if the {@code Content-Type} matches one of these media types.
 	 * Examples:
-	 * <pre>
+	 * <pre class="code">
 	 * consumes = "text/plain"
 	 * consumes = {"text/plain", "application/*"}
 	 * </pre>
@@ -359,7 +359,7 @@
 	 * <p>The format is a single media type or a sequence of media types,
 	 * with a request only mapped if the {@code Accept} matches one of these media types.
 	 * Examples:
-	 * <pre>
+	 * <pre class="code">
 	 * produces = "text/plain"
 	 * produces = {"text/plain", "application/*"}
 	 * </pre>
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 8d02c531ed55..5ec14f0f1f93 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
@@ -79,14 +79,14 @@
  * {@link #getForObject(String, Class, Map)}), and are capable of substituting any {@linkplain UriTemplate URI templates}
  * in that URL using either a {@code String} variable arguments array, or a {@code Map<String, String>}.
  * The string varargs variant expands the given template variables in order, so that
- * <pre>
+ * <pre class="code">
  * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/bookings/{booking}", String.class, "42",
  * "21");
  * </pre>
  * will perform a GET on {@code http://example.com/hotels/42/bookings/21}. The map variant expands the template based
  * on variable name, and is therefore more useful when using many variables, or when a single variable is used multiple
  * times. For example:
- * <pre>
+ * <pre class="code">
  * Map&lt;String, String&gt; vars = Collections.singletonMap("hotel", "42");
  * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
  * </pre>
@@ -95,7 +95,7 @@
  * expanded URI multiple times.
  *
  * <p>Furthermore, the {@code String}-argument methods assume that the URL String is unencoded. This means that
- * <pre>
+ * <pre class="code">
  * restTemplate.getForObject("http://example.com/hotel list");
  * </pre>
  * will perform a GET on {@code http://example.com/hotel%20list}. As a result, any URL passed that is already encoded
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 e479057927d8..3a665593dc1e 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
@@ -29,7 +29,7 @@
  * <p>Configure this handler proxy in your {@code faces-config.xml} file
  * as follows:
  *
- * <pre>
+ * <pre class="code">
  * &lt;application&gt;
  *   ...
  *   &lt;navigation-handler&gt;
@@ -43,7 +43,7 @@
  * Spring bean definition like the following. However, all of Spring's bean configuration
  * power can be applied to such a bean, in particular all flavors of dependency injection.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean name="jsfNavigationHandler" class="mypackage.MyNavigationHandler"&gt;
  *   &lt;property name="myProperty" ref="myOtherBean"/&gt;
  * &lt;/bean&gt;</pre>
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 0edc7b4b0830..6d6c19d2db94 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
@@ -30,7 +30,7 @@
  *
  * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
- * <pre>
+ * <pre class="code">
  * &lt;application>
  *   ...
  *   &lt;el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver&lt;/el-resolver>
@@ -40,7 +40,7 @@
  * Spring-managed service layer beans, for example in property values of
  * JSF-managed beans:
  *
- * <pre>
+ * <pre class="code">
  * &lt;managed-bean>
  *   &lt;managed-bean-name>myJsfManagedBean&lt;/managed-bean-name>
  *   &lt;managed-bean-class>example.MyJsfManagedBean&lt;/managed-bean-class>
@@ -54,7 +54,7 @@
  * with "mySpringManagedBusinessObject" defined as Spring bean in
  * applicationContext.xml:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="mySpringManagedBusinessObject" class="example.MySpringManagedBusinessObject">
  *   ...
  * &lt;/bean></pre>
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 454598405fe2..faab2f4216db 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
@@ -42,7 +42,7 @@
  *
  * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
- * <pre>
+ * <pre class="code">
  * &lt;application>
  *   ...
  *   &lt;el-resolver>org.springframework.web.jsf.el.WebApplicationContextFacesELResolver&lt;/el-resolver>
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 eadf6839c399..13968ae813e8 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
@@ -150,7 +150,7 @@ public static UriComponentsBuilder fromUri(URI uri) {
 	 * contains {@code '='} or {@code '&'} characters, the query string cannot
 	 * be parsed unambiguously. Such values should be substituted for URI
 	 * variables to enable correct parsing:
-	 * <pre>
+	 * <pre class="code">
 	 * String uriString = &quot;/hotels/42?filter={value}&quot;;
 	 * UriComponentsBuilder.fromUriString(uriString).buildAndExpand(&quot;hot&amp;cold&quot;);
 	 * </pre>
@@ -210,7 +210,7 @@ public static UriComponentsBuilder fromUriString(String uri) {
 	 * contains {@code '='} or {@code '&'} characters, the query string cannot
 	 * be parsed unambiguously. Such values should be substituted for URI
 	 * variables to enable correct parsing:
-	 * <pre>
+	 * <pre class="code">
 	 * String uriString = &quot;/hotels/42?filter={value}&quot;;
 	 * UriComponentsBuilder.fromUriString(uriString).buildAndExpand(&quot;hot&amp;cold&quot;);
 	 * </pre>
@@ -448,7 +448,7 @@ public UriComponentsBuilder pathSegment(String... pathSegments) throws IllegalAr
 	 * contains {@code '='} or {@code '&'} characters, the query string cannot
 	 * be parsed unambiguously. Such values should be substituted for URI
 	 * variables to enable correct parsing:
-	 * <pre>
+	 * <pre class="code">
 	 * String uriString = &quot;/hotels/42?filter={value}&quot;;
 	 * UriComponentsBuilder.fromUriString(uriString).buildAndExpand(&quot;hot&amp;cold&quot;);
 	 * </pre>
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 79951a64c792..3a3088e7e621 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
@@ -73,7 +73,7 @@ public abstract class UriUtils {
 	 * <p><strong>Note</strong> that this method does not attempt to encode "=" and "&"
 	 * characters in query parameter names and query parameter values because they cannot
 	 * be parsed in a reliable way. Instead use:
-	 * <pre>
+	 * <pre class="code">
 	 * UriComponents uriComponents = UriComponentsBuilder.fromUri("/path?name={value}").buildAndExpand("a=b");
 	 * String encodedUri = uriComponents.encode().toUriString();
 	 * </pre>
@@ -114,7 +114,7 @@ public static String encodeUri(String uri, String encoding) throws UnsupportedEn
 	 * <p><strong>Note</strong> that this method does not attempt to encode "=" and "&"
 	 * characters in query parameter names and query parameter values because they cannot
 	 * be parsed in a reliable way. Instead use:
-	 * <pre>
+	 * <pre class="code">
 	 * UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl("/path?name={value}").buildAndExpand("a=b");
 	 * String encodedUri = uriComponents.encode().toUriString();
 	 * </pre>
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 2957d73aed66..c4691860d8c8 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
@@ -31,7 +31,7 @@
  * interface to map from the current PortletMode to request handler beans.
  *
  * <p>The bean configuration for this mapping will look something like this:
- * <pre>
+ * <pre class="code">
  * 	&lt;bean id="portletModeHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeHandlerMapping"&gt;
  * 		&lt;property name="portletModeMap"&gt;
  * 			&lt;map&gt;
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 f8a1df3d2040..a76eb221cfd2 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
@@ -61,7 +61,7 @@
  *
  * <p><b>Example:</b>
  *
- * <pre>&lt;bean id="wrappingController" class="org.springframework.web.portlet.mvc.PortletWrappingController"&gt;
+ * <pre class="code">&lt;bean id="wrappingController" class="org.springframework.web.portlet.mvc.PortletWrappingController"&gt;
  *   &lt;property name="portletClass"&gt;
  *     &lt;value&gt;org.springframework.web.portlet.sample.HelloWorldPortlet&lt;/value&gt;
  *   &lt;/property&gt;
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 5b43420b195f..8788236168bb 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
@@ -83,7 +83,7 @@
  *
  * <p>A typical TilesConfigurer bean definition looks as follows:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
  *   &lt;property name="definitions">
  *     &lt;list>
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 73607f6d7fed..2574e1290f8f 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
@@ -38,7 +38,7 @@
  * <p><b>Example:</b> web.xml, mapping all "/myservlet" requests to a Spring dispatcher.
  * Also defines a custom "myServlet", but <i>without</i> servlet mapping.
  *
- * <pre>
+ * <pre class="code">
  * &lt;servlet&gt;
  *   &lt;servlet-name&gt;myServlet&lt;/servlet-name&gt;
  *   &lt;servlet-class&gt;mypackage.TestServlet&lt;/servlet-class&gt;
@@ -59,7 +59,7 @@
  * configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
  * From the servlet point of view, everything will work as usual.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"&gt;
  *   &lt;property name="interceptors"&gt;
  *     &lt;list&gt;
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 10dffda157b0..cdc3f8fddfc3 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
@@ -48,7 +48,7 @@
  * through the configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
  * From the Struts point of view, everything will work as usual.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"&gt;
  *   &lt;property name="interceptors"&gt;
  *     &lt;list&gt;
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 d23b050cbc97..f3f2e8b12eaf 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
@@ -36,7 +36,7 @@
  * automatically propagated to the "output" FlashMap of the current request.
  *
  * <p>Example usage in an {@code @Controller}:
- * <pre>
+ * <pre class="code">
  * &#064;RequestMapping(value = "/accounts", method = RequestMethod.POST)
  * public String handle(Account account, BindingResult result, RedirectAttributes redirectAttrs) {
  *   if (result.hasErrors()) {
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 d702e14f283b..a71e6cb0da8b 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
@@ -63,7 +63,7 @@
  * 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;
+ * <pre class="code">&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:
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 3769cecf3575..5cd17b19345d 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
@@ -37,7 +37,7 @@
  * The simplest way to use this class is to specify just a "templateLoaderPath";
  * you do not need any further configuration then.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer"&gt;
  *   &lt;property name="templateLoaderPath"&gt;&lt;value&gt;/WEB-INF/freemarker/&lt;/value>&lt;/property&gt;
  * &lt;/bean&gt;</pre>
@@ -58,7 +58,7 @@
  * reference the "spring.ftl" macro library (contained in this package and thus
  * in spring.jar) like this:
  *
- * <pre>
+ * <pre class="code">
  * &lt;#import "/spring.ftl" as spring/&gt;
  * &lt;@spring.bind "person.age"/&gt;
  * age is ${spring.status.value}</pre>
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 00bb4439fb75..b2a1b3ef0d04 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
@@ -37,7 +37,7 @@
  * view class. For example you might add the following code to your
  * {@code Controller}:
  *
- * <pre>
+ * <pre class="code">
  * Map<String, Object> model = new HashMap<String, Object>();
  * model.put("format", "pdf");</pre>
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
index 115935fa8995..67a7482840f5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
@@ -137,7 +137,7 @@ public void setPrefixJson(boolean prefixJson) {
 	/**
 	 * Whether to use the default pretty printer when writing JSON.
 	 * This is a shortcut for setting up an {@code ObjectMapper} as follows:
-	 * <pre>
+	 * <pre class="code">
 	 * ObjectMapper mapper = new ObjectMapper();
 	 * mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
 	 * </pre>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
index baa727d8c03a..53cec265e34e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
@@ -137,7 +137,7 @@ public void setPrefixJson(boolean prefixJson) {
 	/**
 	 * Whether to use the default pretty printer when writing JSON.
 	 * This is a shortcut for setting up an {@code ObjectMapper} as follows:
-	 * <pre>
+	 * <pre class="code">
 	 * ObjectMapper mapper = new ObjectMapper();
 	 * mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
 	 * </pre>
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 050aad09cf56..05e035445586 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
@@ -91,7 +91,7 @@
  *
  * <p>A typical TilesConfigurer bean definition looks as follows:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
  *   &lt;property name="definitions">
  *     &lt;list>
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
index c3e119b1f426..db15862b9707 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
@@ -74,7 +74,7 @@ public interface WebSocketSession {
 
 	/**
 	 * Close the WebSocket connection with status 1000, i.e. equivalent to:
-	 * <pre>
+	 * <pre class="code">
 	 * session.close(CloseStatus.NORMAL);
 	 * </pre>
 	 */