diff --git a/spring-integration-reference/reference/src/configuration.xml b/spring-integration-reference/reference/src/configuration.xml
index 32ad71b8be..135c19e90b 100644
--- a/spring-integration-reference/reference/src/configuration.xml
+++ b/spring-integration-reference/reference/src/configuration.xml
@@ -9,14 +9,85 @@
choose depends upon your particular needs and at what level you prefer to work. As with the Spring framework in
general, it is also possible to mix and match the various techniques according to the particular problem at hand.
For example, you may choose the XSD-based namespace for the majority of configuration combined with a handful of
- objects that are configured with annotations. Of course, it is also possible to always follow a single approach.
- The main point is that these are options for configuration - none of which are required.
- The goal is to support a user community with a wide range of needs and preferences. That said, there has also
- been a concerted effort to provide consistent naming so that, for example, the XML elements defined by the XSD
- schema will match the names of annotations, and the attributes of those XML elements will match the names of
- annotation properties. Direct usage of the API is of course always an option and is described in detail in
- . We expect that most users will choose one of the higher-level options, such as the
- namespace-based or annotation-driven configuration.
+ objects that are configured with annotations. Of course, it is also possible to always stick with a single
+ approach. The main point is that these are options for configuration motivated by the need
+ to support a user community with a wide range of preferences. That said, there has also been a concerted effort
+ to provide consistent naming so that, for example, the XML elements defined by the XSD schema will match the
+ names of annotations, and the attributes of those XML elements will match the names of annotation properties.
+ Direct usage of the API is yet another option and is described in detail in . We expect that
+ most users will choose one of the higher-level options, such as the namespace-based or annotation-driven
+ configuration.
+
+
+
+
+ Namespace Support
+
+ Spring Integration components can be configured with XML elements that map directly to the terminology and
+ concepts of enterprise integration. In many cases, the element names match those of the
+ Enterprise Integration Patterns.
+
+
+ To enable Spring Integration's namespace support within your Spring configuration files, add the following
+ namespace reference and schema mapping in your top-level 'beans' element:
+ xmlns:integration="http://www.springframework.org/schema/integration"http://www.springframework.org/schema/integration
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+
+
+ You can choose any name after "xmlns:"; integration is used here for clarity, but you might
+ prefer a shorter abbreviation. Of course if you are using an XML-editor or IDE support, then the availability of
+ auto-completion may convince you to keep the longer name for clarity. Alternatively, you can create configuration
+ files that use the Spring Integration schema as the primary namespace:
+ <beans:beans xmlns="http://www.springframework.org/schema/integration"xmlns:beans="http://www.springframework.org/schema/beans"]]>
+
+
+ When using this alternative, no prefix is necessary for the Spring Integration elements. On the other hand, if
+ you want to define a generic Spring "bean" within the same configuration file, then a prefix would be required
+ for the bean element (<beans:bean ... />). Since it is generally a good idea to modularize the
+ configuration files themselves based on responsibility and/or architectural layer, you may find it appropriate to
+ use the latter approach in the integration-focused configuration files, since generic beans are seldom necessary
+ within those same files. For purposes of this documentation, we will assume the "integration" namespace is
+ primary.
+
+
+
+ Configuring Message Channels
+
+ To create a Message Channel instance, use the 'channel' element:
+ <channel/>
+
+
+ You can also specify the channel's capacity: <channel capacity="100"/>
+
+
+ The default channel type is Point to Point. To create a
+ Publish Subscribe channel, provide a value of true for the
+ 'publish-subscribe' attribute of the channel element:
+ <channel publish-subscribe="true"/>
+
+
+
+
+ Configuring Message Endpoints
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-integration-reference/reference/src/core-api.xml b/spring-integration-reference/reference/src/core-api.xml
index fde7de0fc7..3cc78515b9 100644
--- a/spring-integration-reference/reference/src/core-api.xml
+++ b/spring-integration-reference/reference/src/core-api.xml
@@ -154,7 +154,7 @@ public void registerHandler(String name, MessageHandler handler, Subscription su
Properties of the DispatcherPolicy
-
+
Property Name
@@ -221,8 +221,8 @@ public void registerHandler(String name, MessageHandler handler, Subscription su
a single implementation called PollingSchedule that provides the following properties:
Properties of the PollingSchedule
-
-
+
+
Property Name
diff --git a/spring-integration-reference/reference/src/spring-integration-reference.xml b/spring-integration-reference/reference/src/spring-integration-reference.xml
index 2c9b198559..486d8ae5a9 100644
--- a/spring-integration-reference/reference/src/spring-integration-reference.xml
+++ b/spring-integration-reference/reference/src/spring-integration-reference.xml
@@ -20,7 +20,7 @@
-
+