diff --git a/spring-framework-reference/src/getting-started.xml b/spring-framework-reference/src/getting-started.xml index e6f8d16b967..546fa904908 100644 --- a/spring-framework-reference/src/getting-started.xml +++ b/spring-framework-reference/src/getting-started.xml @@ -5,9 +5,10 @@ Getting started with Spring - This chapter will give you a quick introduction and a guide for how to get started - in using the Spring Framework for your Java development. We can of course only cover a tiny - subset of the available features in this chapter. You will have to turn to the rest of this + + This chapter will give you a quick introduction and serve as a guide for how to get started + using the Spring Framework for your Java development. We can of course only cover a tiny + subset of the available features in this chapter. You will have to turn to the rest of this reference document for more detailed coverage of all features.
diff --git a/spring-framework-reference/src/new-in-3.xml b/spring-framework-reference/src/new-in-3.xml index d96f5618252..00ecf9c7228 100644 --- a/spring-framework-reference/src/new-in-3.xml +++ b/spring-framework-reference/src/new-in-3.xml @@ -12,7 +12,7 @@ Java SE and Java EE Support - The Spring Framework is now based on Java 5 and Java 6 is fully + The Spring Framework is now based on Java 5, and Java 6 is fully supported. Furthermore, Spring is compatible with J2EE 1.4 and Java EE 5, while @@ -201,27 +201,29 @@
Core APIs updated for Java 5 - BeanFactoryinterface returns typed bean instancesas far as - possible - - T getBean(Stringname, Class<T> requiredType) - - - - Map<String, T> getBeansOfType(Class<T> - type) - - - - Spring's TaskExecutorinterface extends - java.util.concurrent.Executor now + BeanFactory interface returns typed bean instances as far as possible: + + + T getBean(Stringname, Class<T> requiredType) + + + + Map<String, T> getBeansOfType(Class<T> type) + + + + + Spring's TaskExecutor interface now extends + java.util.concurrent.Executor: + extended AsyncTaskExecutor supports standard Callables with Futures - New Java 5 based converter API and SPI + New Java 5 based converter API and SPI: + stateless ConversionService and Converters @@ -246,11 +248,11 @@ linkend="expressions">Spring Expression Language (SpEL). The Spring Expression Language was created to provide the Spring - community with a single well supported expression language that can used + community a single, well supported expression language that can be used across all the products in the Spring portfolio. Its language features are driven by the requirements of the projects in the Spring portfolio, including tooling requirements for code completion support within the - eclipse based SpringSource Tool Suite. + Eclipse based SpringSource Tool Suite. The following is an example of how the Expression Language can be used to configure some properties of a database setup Java based bean metadata - Some core features from the JavaConfig project have been added to the - Spring Framework now. This means that the following annotations are - now directly supported: + + Some core features from the + JavaConfig + project have been added to the Spring Framework now. This means + that the following annotations are now directly supported: + + @Configuration @@ -309,7 +313,8 @@ public class RewardsTestDatabase { @Value - + + Here is an example of a Java class providing basic configuration using the new JavaConfig features: @Configuration @@ -362,10 +367,10 @@ public class AppConfig{ The Data Tier Object to XML mapping functionality (OXM) from the Spring Web - Services project have been moved to the core Spring Framework now. The + Services project has been moved to the core Spring Framework now. The functionality is found in the org.springframework.oxm - package. More information on the use of the OXM can - be found in the Marshalling XML using O/X + package. More information on the use of the OXM module + can be found in the Marshalling XML using O/X Mappers chapter.
diff --git a/spring-framework-reference/src/spring-framework-reference.xml b/spring-framework-reference/src/spring-framework-reference.xml index 57cc693e6b1..2af85d1870d 100644 --- a/spring-framework-reference/src/spring-framework-reference.xml +++ b/spring-framework-reference/src/spring-framework-reference.xml @@ -108,7 +108,7 @@ 2004-2009 Rod Johnson, Juergen Hoeller, Alef Arendsen, Colin Sampaleanu, Rob Harrop, Thomas Risberg, Darren Davison, Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis, - Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abbed Rabbo + Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abed Rabbo