diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml
index 4a2c95bbae0..ad22eef9aa0 100644
--- a/spring-framework-reference/src/beans.xml
+++ b/spring-framework-reference/src/beans.xml
@@ -5815,7 +5815,7 @@ public @interface MovieQualifier {
stereotype of a repository (a.k.a. Data Access
Object or DAO). Among the possibilities for leveraging such a marker is
the automatic translation of exceptions as described in .
+ linkend="orm-exception-translation" />.
Spring 2.5 introduces further stereotype annotations:
@Component,
diff --git a/spring-framework-reference/src/dynamic-languages.xml b/spring-framework-reference/src/dynamic-languages.xml
index e622556b230..3cbcc5b2870 100644
--- a/spring-framework-reference/src/dynamic-languages.xml
+++ b/spring-framework-reference/src/dynamic-languages.xml
@@ -224,7 +224,7 @@ http://www.springframework.org/schema/lang http://www.springframework.org/schema
The final step involves defining dynamic-language-backed bean definitions,
one for each bean that you want to configure (this is no different to
- normal Java bean configuration). However, instead of specifying the
+ normal JavaBean configuration). However, instead of specifying the
fully qualified classname of the class that is to be instantiated and
configured by the container, you use the <lang:language/>
element to define the dynamic language-backed bean.
diff --git a/spring-framework-reference/src/ejb.xml b/spring-framework-reference/src/ejb.xml
index 31c5b410220..0a776b017ab 100644
--- a/spring-framework-reference/src/ejb.xml
+++ b/spring-framework-reference/src/ejb.xml
@@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
- Enterprise Java Beans (EJB) integration
+ Enterprise JavaBeans (EJB) integrationIntroduction
diff --git a/spring-framework-reference/src/metadata.xml b/spring-framework-reference/src/metadata.xml
index 131e95d9f39..39b0cb9a027 100644
--- a/spring-framework-reference/src/metadata.xml
+++ b/spring-framework-reference/src/metadata.xml
@@ -38,12 +38,12 @@ public class PetStoreImpl implements PetStoreFacade, OrderService {
- Spring uses custom Java 5 annotations thoughout the framework across
- a wide range of features such as DI, MVC, and AOP and supports JEE
- standard annotations such as @PreDestroy and @PostConstruct defined by
- JSR-250. This chapter describes the @Required attribute and provides links
- to other parts the documentation where the various attributes are
- described in more detail.
+ Spring uses Java 5 annotations thoughout the framework across a wide
+ range of features such as DI, MVC, and AOP and supports JEE standard
+ annotations such as @PreDestroy and @PostConstruct defined by JSR-250.
+ This chapter describes the @Required attribute and provides links to other
+ parts the documentation where the various attributes are described in more
+ detail.
diff --git a/spring-framework-reference/src/orm.xml b/spring-framework-reference/src/orm.xml
index 240f30663c5..9ce6e2d7b65 100644
--- a/spring-framework-reference/src/orm.xml
+++ b/spring-framework-reference/src/orm.xml
@@ -118,21 +118,21 @@
which ORM technology you use. The Hibernate section provides more details
and also show these features/configurations in a concrete context.
- The major goal is to allow for clear application layering, with any
- data access and transaction technology, and for loose coupling of
- application objects. No more business service dependencies on the data
- access or transaction strategy, no more hard-coded resource lookups, no
- more hard-to-replace singletons, no more custom service registries. One
- simple and consistent approach to wiring up application objects, keeping
- them as reusable and free from container dependencies as possible. All the
- individual data access features are usable on their own but integrate
- nicely with Spring's application context concept, providing XML-based
- configuration and cross-referencing of plain JavaBean instances that don't
- need to be Spring-aware. In a typical Spring application, many important
- objects are JavaBeans: data access templates, data access objects,
- transaction managers, business services (that use the data access objects
- and transaction managers), web view resolvers, web controllers (that use
- the business services),and so on.
+ The major goal of Spring's ORM integration is to allow for clear
+ application layering, with any data access and transaction technology, and
+ for loose coupling of application objects. No more business service
+ dependencies on the data access or transaction strategy, no more
+ hard-coded resource lookups, no more hard-to-replace singletons, no more
+ custom service registries. One simple and consistent approach to wiring up
+ application objects, keeping them as reusable and free from container
+ dependencies as possible. All the individual data access features are
+ usable on their own but integrate nicely with Spring's application context
+ concept, providing XML-based configuration and cross-referencing of plain
+ JavaBean instances that don't need to be Spring-aware. In a typical Spring
+ application, many important objects are JavaBeans: data access templates,
+ data access objects, transaction managers, business services (that use the
+ data access objects and transaction managers), web view resolvers, web
+ controllers (that use the business services),and so on.Resource and Transaction management
@@ -386,12 +386,12 @@ public class ProductDaoImpl implements ProductDao {
Declarative transaction demarcationWe recommended that you use Spring's declarative transaction
- support, which essentially enables you to replace explicit transaction
- demarcation API calls in your Java code with an AOP transaction
- interceptor configured in a Spring container. This allows you to keep
- business services free of repetitive transaction demarcation code, and
- allows you to focus on adding business logic which is where the real
- value of your application lies.
+ support, which enables you to replace explicit transaction demarcation
+ API calls in your Java code with an AOP transaction interceptor
+ configured in a Spring container using Java annotations or XML. This
+ allows you to keep business services free of repetitive transaction
+ demarcation code, and allows you to focus on adding business logic which
+ is where the real value of your application lies.You are strongly encouraged to read the
@@ -925,10 +925,10 @@ public class ProductDaoImpl implements ProductDao {
up through direct instantiation of a
PersistenceManagerFactory implementation
class. A JDO PersistenceManagerFactory
- implementation class is supposed to follow the JavaBeans pattern, just
- like a JDBC DataSource implementation
- class, which is a natural fit for a Spring bean definition. This setup
- style usually supports a Spring-defined JDBC
+ implementation class follows the JavaBeans pattern, just like a JDBC
+ DataSource implementation class, which is
+ a natural fit for configuration using Spring. This setup style usually
+ supports a Spring-defined JDBC
DataSource, passed into the
"connectionFactory" property. For example, for the open source JDO
implementation DataNucleus (formerly JPOX) (
-
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
Introduction
@@ -138,13 +137,13 @@
The Core
Container consists of the Core, Beans, Context and
- Expression modules.
+ Expression modules.The Core and
Beans modules provide the most fundamental parts of
the framework and provides the IoC and Dependency Injection features.
- The basic concept here is the BeanFactory, which
- provides a sophisticated implementation of the factory pattern which
+ The basic concept here is the BeanFactory which
+ provides a sophisticated implementation of the factory pattern. It
removes the need for programmatic singletons and allows you to decouple
the configuration and specification of dependencies from your actual
program logic.
@@ -160,7 +159,9 @@
event-propagation, resource-loading, and the transparent creation of
contexts by, for example, a servlet container. The Context module also
contains support for some Java EE features like EJB, JMX and basic
- remoting support.
+ remoting support. The ApplicationContext
+ interface is the focal point of the Context module that provides these
+ features.
The Expression Language module provides a
powerful expression language for querying and manipulating an object
@@ -182,7 +183,7 @@
The JDBC module provides
a JDBC-abstraction layer that removes the need to do tedious JDBC coding
- and parsing of database-vendor specific error codes.
+ and parsing of database-vendor specific error codes.The ORM module
@@ -195,30 +196,32 @@
offers, such as the simple declarative transaction management feature
mentioned previously.
- The OXM module provides an abstraction layer for using a number of
- Object/XML mapping implementations. Supported technologies include JAXB,
- Castor, XMLBeans, JiBX and XStream.
+ The OXM module provides an abstraction
+ layer for using a number of Object/XML mapping implementations.
+ Supported technologies include JAXB, Castor, XMLBeans, JiBX and
+ XStream.
- The JMS module provides Spring's support for the Java Messaging Service. It
- contains features for both producing and consuming messages.
+ The JMS module provides Spring's
+ support for the Java Messaging Service. It contains features for both
+ producing and consuming messages.
- The Transaction module provides a way to do programmatic as well
- as declarative transaction management, not only for classes implementing
- special interfaces, but for all your POJOs (plain old Java
- objects).
+ The Transaction module provides
+ a way to do programmatic as well as declarative transaction management,
+ not only for classes implementing special interfaces, but for
+ all your POJOs (plain old Java objects).Web
- The Web layer consists of the Web, Web-Servlet
- and Web-Portlet modules.
+ The Web layer consists of the Web,
+ Web-Servlet and Web-Portlet modules.Spring's Web module provides basic
web-oriented integration features, such as multipart file-upload
functionality, the initialization of the IoC container using servlet
- listeners and a web-oriented application context. It also contains the web
- related parts of Spring's remoting support.
+ listeners and a web-oriented application context. It also contains the
+ web related parts of Spring's remoting support.
The Web-Servlet module provides Spring's
Model-View-Controller (
-
+
-
+
Typical full-fledged Spring web
@@ -304,13 +309,13 @@
-
+
-
+
Spring middle-tier using a third-party web
@@ -330,11 +335,13 @@
-
+
-
+
Remoting usage scenario
@@ -348,11 +355,13 @@
-
+
-
+
EJBs - Wrapping existing POJOs
@@ -364,4 +373,4 @@
use in scalable, failsafe web applications that might need declarative
security.