diff --git a/spring-integration-reference/src/chain.xml b/spring-integration-reference/src/chain.xml index cfedced970..d30ce746a6 100644 --- a/spring-integration-reference/src/chain.xml +++ b/spring-integration-reference/src/chain.xml @@ -45,6 +45,7 @@ ]]> + The <header-enricher> used in the above example will set a message header with name "foo" and value "bar" on the message. \ No newline at end of file diff --git a/spring-integration-reference/src/event.xml b/spring-integration-reference/src/event.xml index fe873450f8..9f2fff9756 100644 --- a/spring-integration-reference/src/event.xml +++ b/spring-integration-reference/src/event.xml @@ -5,7 +5,7 @@ Spring Integration also provides support for inbound and outbound ApplicationEvents. To receive events and send to a channel, simply define an instance of Spring Integration's - ApplicationEventListeningChannelAdapter. This class in an implementation of Spring's + ApplicationEventListeningChannelAdapter. This class is an implementation of Spring's ApplicationListener interface. By default it will pass all received events as Spring Integration Messages. To limit based on the type of event, configure the list of event types that you want to receive with the 'eventTypes' property. diff --git a/spring-integration-reference/src/file.xml b/spring-integration-reference/src/file.xml index a1cab6cece..2969126641 100644 --- a/spring-integration-reference/src/file.xml +++ b/spring-integration-reference/src/file.xml @@ -29,7 +29,7 @@ To prevent creating messages for certain files, you may supply a - {@link FileListFilter}. By default, an + FileListFilter. By default, an AcceptOnceFileListFilter is used. This filter ensures files are picked up only once from the directory. @@ -84,15 +84,15 @@ Within this namespace you can reduce the FileReadingMessageSource and wrap it in an InboundChannelAdapter like this: (1) + directory="file:${input.directory.property}"/> (2) + filter="customFilterBean" /> (3)]]> - Where (1) is relying on the default filter that just prevents - duplication, (2) is using a custom filter and (3) is using the + filename-pattern="^test.*$" /> ]]> + Where the first channel adapter is relying on the default filter that just prevents + duplication. The second is using a custom filter and the third is using the filename-pattern attribute to add a Pattern @@ -168,7 +168,7 @@ To configure File specific transformers you can use the appropriate elements from the file namespace. - ]]> + ]]> The delete-files option signals the transformer to delete the File after the diff --git a/spring-integration-reference/src/jms.xml b/spring-integration-reference/src/jms.xml index f299d6f144..d63292369e 100644 --- a/spring-integration-reference/src/jms.xml +++ b/spring-integration-reference/src/jms.xml @@ -53,7 +53,7 @@ -]]> + ]]> @@ -77,9 +77,9 @@ The 'extract-payload' property has the same effect as described above, and once again its default value - is 'true'. Of course, the poller sub-element is not required (not accepted actually) for a message-driven - Channel Adapter. For most usage scenarios, the message-driven approach is better since the Messages will - be passed along to the Spring Integration Message Channel as soon as they are received from the underlying + is 'true'. The poller sub-element is not applicable for a message-driven + Channel Adapter, as it will be actively invoked. For most usage scenarios, the message-driven approach is better since the Messages will + be passed along to the MessageChannel as soon as they are received from the underlying JMS consumer. diff --git a/spring-integration-reference/src/mail.xml b/spring-integration-reference/src/mail.xml index ee9c863be0..0325fcb24d 100644 --- a/spring-integration-reference/src/mail.xml +++ b/spring-integration-reference/src/mail.xml @@ -100,7 +100,7 @@ When using the namespace support, a header-enricher Message Transformer is also available. This simplifies the application of the headers mentioned above to any Message prior to sending to the - Mail-sending Channel Adapter. Also, note that a boolean value c + Mail-sending Channel Adapter. - input-channel="inputChannel" - output-channel="outputChannel" - discard-channel="discardChannel" - release-partial-sequences="true" - timeout="42" - send-partial-result-on-timeout="true" - reaper-interval="135" - tracked-correlation-id-capacity="99" - send-timeout="86420000" /> +<resequencer id="completelyDefinedResequencer" + input-channel="inputChannel" + output-channel="outputChannel" + discard-channel="discardChannel" + release-partial-sequences="true" + timeout="42" + send-partial-result-on-timeout="true" + reaper-interval="135" + tracked-correlation-id-capacity="99" + send-timeout="86420000" /> - + The id of the resequencer is optional. - + The input channel of the resequencer. Required. - + The channel where the resequencer will send the reordered messages. Optional. - + The channel where the resequencer will send the messages that timed out (if send-partial-result-on-timeout is false). Optional. - + Whether to send out ordered sequences as soon as they are available, or only after the whole message group arrives. Optional (true by default). - + The timeout for reordering message sequences (counted from the arrival of the first message). Optional. - + Whether, upon the expiration of the timeout, the ordered group shall be sent out (even if some of the messages are missing). Optional (false by default). - + The interval (in milliseconds) at which a reaper task is executed, checking if there are any timed out groups. Optional. - + The capacity of the correlation id tracker. Remembers the already processed correlation ids, preventing the formation of new groups for messages that arrive after their group has been already @@ -103,7 +103,7 @@ Optional. - + The timeout for sending out messages. Optional. diff --git a/spring-integration-reference/src/resources.xml b/spring-integration-reference/src/resources.xml index a4f4c75b23..81d1020356 100644 --- a/spring-integration-reference/src/resources.xml +++ b/spring-integration-reference/src/resources.xml @@ -7,8 +7,8 @@ Spring Integration Home The definitive source of information about Spring Integration is the - Spring Integration Home at - http://www.springframework.org. That site serves as a hub of + Spring Integration Home at + http://www.springframework.org. That site serves as a hub of information and is the best place to find up-to-date announcements about the project as well as links to articles, blogs, and new sample applications. diff --git a/spring-integration-reference/src/router.xml b/spring-integration-reference/src/router.xml index 3beeb68be9..cd3f7f4c09 100644 --- a/spring-integration-reference/src/router.xml +++ b/spring-integration-reference/src/router.xml @@ -91,7 +91,7 @@ public List<String> route(Foo payload) {...} In addition to payload-based routing, a common requirement is to route based on metadata available within the message header as either a property or attribute. Rather than requiring use of the Message type as the method parameter, the @Router - annotation may also use the same @Header parameter annotation that was introduced above. + annotation may also use the @Header parameter annotation that is documented in section . @Router public List<String> route(@Header("orderStatus") OrderStatus status) diff --git a/spring-integration-reference/src/transformer.xml b/spring-integration-reference/src/transformer.xml index 59d6002ee5..b710bd4bbd 100644 --- a/spring-integration-reference/src/transformer.xml +++ b/spring-integration-reference/src/transformer.xml @@ -57,8 +57,7 @@ Order generateOrder(String productId) { } - Transformer methods may also accept the @Header and @Headers annotations. For example, one of those annotations - may complement the payload Object as an additional parameter: + Transformer methods may also accept the @Header and @Headers annotations that is documented in section @Transformer Order generateOrder(String productId, @Header("customerName") String customer) { return new Order(productId, customer); diff --git a/spring-integration-reference/src/xml.xml b/spring-integration-reference/src/xml.xml index 2557cc1f91..bf81c45426 100644 --- a/spring-integration-reference/src/xml.xml +++ b/spring-integration-reference/src/xml.xml @@ -201,7 +201,7 @@ - + ]]>