diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml
index 083cf6f04b0..f03a553d493 100644
--- a/spring-framework-reference/src/beans.xml
+++ b/spring-framework-reference/src/beans.xml
@@ -3965,7 +3965,6 @@ org.springframework.scripting.groovy.GroovyMessenger@272961
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations" value="classpath:com/foo/jdbc.properties"/>
- </property>
</bean>
<bean id="dataSource" destroy-method="close"
@@ -4217,9 +4216,9 @@ dataSource.url=jdbc:mysql:mydb
url="http://static.springframework.org/spring/docs/3.0.x/javadoc-api/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.html">RequiredAnnotationBeanPostProcessor.)
- <context:annotation-config/>
- only looks for annotations on beans in the same application context in
- which it is defined. This means that, if you put
+ <context:annotation-config/> only looks
+ for annotations on beans in the same application context in which it is
+ defined. This means that, if you put
<context:annotation-config/> in a
WebApplicationContext for a
DispatcherServlet, it only checks for
@@ -4270,9 +4269,10 @@ dataSource.url=jdbc:mysql:mydb
@Autowired in the examples below.
@Inject does not have a required
property unlike Spring's @Autowire
- annotation which has a required property to indicate if the value being
- injected is optional. This behavior is enabled automatically if you
- have the JSR 330 JAR on the classpath.
+ annotation which has a required property to
+ indicate if the value being injected is optional. This behavior is
+ enabled automatically if you have the JSR 330 JAR on the
+ classpath.
public class SimpleMovieLister {
@@ -4443,11 +4443,11 @@ dataSource.url=jdbc:mysql:mydb
simplest case, this can be a plain descriptive value:
- JSR 330's @Qualifier
- annotation can only be applied as a meta-annotation unlike Spring's
- @Qualifier which takes a string property to discriminate among
- multiple injection candidates and can be placed on annotations as well
- as types, fields, methods, constructors, and parameters.
+ JSR 330's @Qualifier annotation
+ can only be applied as a meta-annotation unlike Spring's @Qualifier
+ which takes a string property to discriminate among multiple injection
+ candidates and can be placed on annotations as well as types, fields,
+ methods, constructors, and parameters.
public class MovieRecommender {
@@ -4968,9 +4968,10 @@ public @interface MovieQualifier {
project are part of the core Spring Framework. This allows you
to define beans using Java rather than using the traditional XML files.
Take a look at the @Configuration,
- @Bean, @Import, and
- @DependsOn annotations for examples of how to use
- these new features.
+ @Bean,
+ @Import, and
+ @DependsOn annotations for examples of
+ how to use these new features.
@@ -5089,9 +5090,9 @@ public class JpaMovieFinder implements MovieFinder {
component-scanning. The value of the
@Named property will be used as the
Bean Name. At this time Spring defaults for bean scope will be applied
- when using @Named. This behavior as well as mapping of JSR 330 and
- JSR 299 scopes is planned for Spring 3.0 GA assuming the JSRs are
- stable at that time.
+ when using @Named. This behavior as well as mapping of JSR 330 and JSR
+ 299 scopes is planned for Spring 3.0 GA assuming the JSRs are stable
+ at that time.
@@ -5315,9 +5316,10 @@ public class FactoryMethodComponent {
corresponding bean definition.
- JSR 330's @Named annotation can be used as a means to both detect
- components and to provide them with a name. This behavior is enabled
- automatically if you have the JSR 330 JAR on the classpath.
+ JSR 330's @Named annotation can be used as a means to both
+ detect components and to provide them with a name. This behavior is
+ enabled automatically if you have the JSR 330 JAR on the
+ classpath.
If such an annotation contains no name value or
@@ -6046,19 +6048,20 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.
injected with the application context's
MessageSource when the bean is created and
configured.
+
- As an alternative to
- ResourceBundleMessageSource, Spring provides
- a ReloadableResourceBundleMessageSource
- class. This variant supports the same bundle file format but is more
- flexible than the standard JDK based
- ResourceBundleMessageSource
- implementation. In particular, it allows for reading
- files from any Spring resource location (not just from the
- classpath) and supports hot reloading of bundle property files
- (while efficiently caching them in between). Check out the
- ReloadableResourceBundleMessageSource javadoc
- for details.
+ As an alternative to
+ ResourceBundleMessageSource, Spring provides a
+ ReloadableResourceBundleMessageSource class.
+ This variant supports the same bundle file format but is more flexible
+ than the standard JDK based
+ ResourceBundleMessageSource
+ implementation. In particular, it allows for reading files
+ from any Spring resource location (not just from the classpath) and
+ supports hot reloading of bundle property files (while efficiently
+ caching them in between). Check out the
+ ReloadableResourceBundleMessageSource javadoc
+ for details.
@@ -6405,17 +6408,16 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.
your application server's deployment directory.
- Such RAR deployment units are usually self-contained; they do
- not expose components to the outside world, not even to other
- modules of the same application. Interaction with a RAR-based
- ApplicationContext usually occurs through JMS destinations that it
- shares with other modules. A RAR-based ApplicationContext may also,
- for example, schedule some jobs, reacting to new files in the file
- system (or the like). If it needs to allow synchronous access from
- the outside, it could for example export RMI endpoints, which of
- course may be used by other application modules on the same
- machine.
-
+ Such RAR deployment units are usually self-contained; they do
+ not expose components to the outside world, not even to other modules
+ of the same application. Interaction with a RAR-based
+ ApplicationContext usually occurs through JMS destinations that it
+ shares with other modules. A RAR-based ApplicationContext may also,
+ for example, schedule some jobs, reacting to new files in the file
+ system (or the like). If it needs to allow synchronous access from the
+ outside, it could for example export RMI endpoints, which of course
+ may be used by other application modules on the same machine.
+