From 3dc6b94810a403811a2938e64d3bed006206f22d Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 28 Apr 2010 11:05:08 +0000 Subject: [PATCH] SPR-7090 + fix doc typos git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3301 50f2f4bb-b051-0410-bef5-90022cba6387 --- spring-framework-reference/src/beans.xml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml index 2f175e7a34e..51045833775 100644 --- a/spring-framework-reference/src/beans.xml +++ b/spring-framework-reference/src/beans.xml @@ -252,7 +252,7 @@ The footnote should x-ref to first section in that chapter but I can't find the The following example shows the data access objects - daos.xml) file: + daos.xml file: <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" @@ -1012,11 +1012,6 @@ public class ExampleBean { no-argument constructor or no-argument static factory method to instantiate your bean. - The ApplicationContext supports - constructor- and setter-based DI for the beans it manages. It also - supports setter-based DI after some dependencies are already injected - through the constructor approach. - The following example shows a class that can only be dependency-injected using pure setter injection. This class is conventional Java. It is a POJO that has no dependencies on container @@ -1089,7 +1084,7 @@ public class ExampleBean { The ApplicationContext is - created an initialized with configuration metadata that describes + created and initialized with configuration metadata that describes all the beans. Configuration metadata can be specified via XML, Java code or annotations. @@ -1806,7 +1801,7 @@ support=support@example.co.uk The example shows an attribute in the p-namespace called email in the bean definition. This tells Spring to include a property - declaration. As previously mentioned, the p-namespace not have a + declaration. As previously mentioned, the p-namespace does not have a schema definition, so you can set the name of the attribute to the property name. @@ -1994,7 +1989,7 @@ support=support@example.co.uk Autowiring can update a configuration as your objects evolve. For example, if you need to add a dependency to a class, - that dependency can be satisfied automatically your needing to + that dependency can be satisfied automatically without your needing to modify the configuration. Thus autowiring can be especially useful during development, without negating the option of switching to explicit wiring when the code base becomes more stable. @@ -2567,7 +2562,7 @@ public class ReplacementComputeValue implements MethodReplacer { linkend="beans-factory-scopes-singleton">singleton - Scopes a single bean definition to a single object + (Default) Scopes a single bean definition to a single object instance per Spring IoC container. @@ -3245,7 +3240,7 @@ beanFactory.registerScope("thread", threadScope destroy() for the latter to allow the bean to perform certain actions upon initialization and destruction of your beans. You can also achieve the same integration with the container - without coupling your classes to Spring interfaces though the use of + without coupling your classes to Spring interfaces through the use of init-method and destroy method object definition metadata. Internally, the Spring Framework uses @@ -3410,7 +3405,7 @@ beanFactory.registerScope("thread", threadScope attribute on the top-level <beans/> element attribute causes the Spring IoC container to recognize a method called init on beans as the initialization method - callback. When a bean is created and assembled, if the beans class has + callback. When a bean is created and assembled, if the bean class has such a method, it is invoked at the appropriate time. You configure destroy method callbacks similarly (in XML, that @@ -4551,7 +4546,7 @@ dataSource.url=jdbc:mysql:mydb An alternative to XML setups is provided by annotation-based configuration which rely on the bytecode metadata for wiring up components instead on angle-bracket declarations. Instead of using XML to describe a - bean wiring, the developers moves the configuration into the component + bean wiring, the developer moves the configuration into the component class itself by using annotations on relevant class, method or field declaration. As mentioned in , using a @@ -6784,7 +6779,7 @@ public class AppConfig { programmatic way. The org.springframework.context package adds the ApplicationContext - interface, which implements the BeanFactory + interface, which extends the BeanFactory interface, in addition to extending other interfaces to provide additional functionality in a more application framework-oriented style. Many people use the