From e993c0db6b7d912ec4b58a149dbd66bad9420b8f Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 25 Nov 2008 23:37:20 +0000
Subject: [PATCH] Added discussion of top-level poller elements and default
 poller per-context (INT-493).

---
 spring-integration-reference/src/endpoint.xml | 49 ++++++++++++++++---
 .../src/spring-integration-reference.xml      |  2 +-
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/spring-integration-reference/src/endpoint.xml b/spring-integration-reference/src/endpoint.xml
index 6361b9fe74..54aa8fcba9 100644
--- a/spring-integration-reference/src/endpoint.xml
+++ b/spring-integration-reference/src/endpoint.xml
@@ -75,7 +75,7 @@ EventDrivenConsumer consumer = new EventDrivenConsumer(channel, exampleHandler);
 PollingConsumer consumer = new PollingConsumer(channel, exampleHandler);</programlisting>
     </para>
     <para>
-      There are many other configuration options for the Polling Consumer. For example, the trigger can be provided:
+      There are many other configuration options for the Polling Consumer. For example, the trigger is a required property:
       <programlisting language="java">
 PollingConsumer consumer = new PollingConsumer(channel, handler);
 
@@ -139,13 +139,48 @@ consumer.setTransactionManager(txManager);</programlisting>
       referenced: <interfacename>PollableChannel</interfacename> or <interfacename>SubscribableChannel</interfacename>
       respectively. When the channel is pollable, then the polling behavior is determined based on the endpoint
       element's "poller" sub-element. For example, a simple interval-based poller with a 1-second interval would be
-      configured like this: <programlisting language="xml"><![CDATA[<poller>
-    <interval-trigger interval="1000"/>
-</poller>]]></programlisting>
+      configured like this: <programlisting language="xml"><![CDATA[ <transformer input-channel="pollable"
+              ref="transformer"
+              output-channel="output">
+     <poller>
+         <interval-trigger interval="1000"/>
+     </poller>
+</transformer>]]></programlisting>
       For a poller based on a Cron expression, use the "cron-trigger" child element instead:
-      <programlisting language="xml"><![CDATA[<poller>
-    <cron-trigger expression="*/10 * * * * MON-FRI"/>
-</poller>]]></programlisting>
+      <programlisting language="xml"><![CDATA[ <transformer input-channel="pollable"
+              ref="transformer"
+              output-channel="output">
+     <poller>
+         <cron-trigger expression="*/10 * * * * MON-FRI"/>
+     </poller>
+ </transformer>]]></programlisting>
+    </para>
+    <para>
+      If the input channel is a <interfacename>PollableChannel</interfacename>, then the poller configuration is
+      required. Specifically, as mentioned above, the 'trigger' is a required property of the PollingConsumer class.
+      Therefore, if you omit the "poller" sub-element for a Polling Consumer endpoint's configuration, an Exception
+      will be thrown. However, it is also possible to create top-level pollers in which case only a "ref" is required:
+      <programlisting language="xml"><![CDATA[ <poller id="weekdayPoller">
+     <cron-trigger expression="*/10 * * * * MON-FRI"/>
+ </poller>
+
+ <transformer input-channel="pollable"
+              ref="transformer"
+              output-channel="output">
+    <poller ref="weekdayPoller"/>
+ </transformer>]]></programlisting>
+      In fact, to simplify the configuration, you can define a global default poller. A single top-level poller within
+      an ApplicationContext may have the default attribute with a value of "true". In that case, any endpoint with a
+      PollableChannel for its input-channel that is defined within the same ApplicationContext and has no explicitly
+      configured 'poller' sub-element will use that default.
+      <programlisting language="xml"><![CDATA[ <poller id="defaultPoller" default="true" max-messages-per-poll="5">
+     <interval-trigger interval="3" time-unit="SECONDS"/>
+ </poller>
+
+ <!-- No <poller/> sub-element is necessary since there is a default -->
+ <transformer input-channel="pollable"
+              ref="transformer"
+              output-channel="output"/>]]></programlisting>
     </para>
     <para>
       Spring Integration also provides transaction support for the pollers so that each receive-and-forward
diff --git a/spring-integration-reference/src/spring-integration-reference.xml b/spring-integration-reference/src/spring-integration-reference.xml
index 4cc70b2267..8846485181 100644
--- a/spring-integration-reference/src/spring-integration-reference.xml
+++ b/spring-integration-reference/src/spring-integration-reference.xml
@@ -5,7 +5,7 @@
     <title>Spring Integration Reference Manual</title>
 
     <productname>Spring Integration</productname>
-    <releaseinfo>1.0.0.RC2 (Release Candidate 2)</releaseinfo>
+    <releaseinfo>1.0.0</releaseinfo>
 
     <mediaobject>
       <imageobject role="fo">