diff --git a/src/reference/asciidoc/amqp.adoc b/src/reference/asciidoc/amqp.adoc index 5eb800f0e9..e0736fb16a 100644 --- a/src/reference/asciidoc/amqp.adoc +++ b/src/reference/asciidoc/amqp.adoc @@ -1378,7 +1378,7 @@ See the <> that appears later in this section for w To override the default and revert to the pre-4.3 behavior, use `STANDARD_REQUEST_HEADERS` and `STANDARD_REPLY_HEADERS` in the properties. -TIP: When mapping user-defined headers, the values can also contain simple wildcard patterns (such as 'thing*' or `*thing`) to be matched. +TIP: When mapping user-defined headers, the values can also contain simple wildcard patterns (such as `thing*` or `*thing`) to be matched. `*` matches all headers. Starting with version 4.1, the `AbstractHeaderMapper` (a `DefaultAmqpHeaderMapper` superclass) lets the `NON_STANDARD_HEADERS` token be configured for the `requestHeaderNames` and `replyHeaderNames` properties (in addition to the existing `STANDARD_REQUEST_HEADERS` and `STANDARD_REPLY_HEADERS`) to map all user-defined headers. diff --git a/src/reference/asciidoc/http.adoc b/src/reference/asciidoc/http.adoc index c9ec403d25..6a3347abb1 100644 --- a/src/reference/asciidoc/http.adoc +++ b/src/reference/asciidoc/http.adoc @@ -356,19 +356,19 @@ Starting with version 4.2, you can configure the ` It represents the same options as Spring MVC's `@CrossOrigin` for `@Controller` annotations and allows the configuration of cross-origin resource sharing (CORS) for Spring Integration HTTP endpoints: * `origin`: List of allowed origins. -`*` means that all origins are allowed. +The `pass:[*]` means that all origins are allowed. These values are placed in the `Access-Control-Allow-Origin` header of both the pre-flight and actual responses. -The default value is `*`. +The default value is `pass:[*]`. * `allowed-headers`: Indicates which request headers can be used during the actual request. -`*` means that all headers requested by the client are allowed. +The `pass:[*]` means that all headers requested by the client are allowed. This property controls the value of the pre-flight response's `Access-Control-Allow-Headers` header. -The default value is `*`. +The default value is `pass:[*]`. * `exposed-headers`: List of response headers that the user-agent lets the client access. This property controls the value of the actual response's `Access-Control-Expose-Headers` header. * `method`: The HTTP request methods to allow: `GET`, `POST`, `HEAD`, `OPTIONS`, `PUT`, `PATCH`, `DELETE`, `TRACE`. Methods specified here overrides those in `supported-methods`. * `allow-credentials`: Set to `true` if the the browser should include any cookies associated to the domain of the request or `false` if it should not. -An empty string ('""') means undefined. +An empty string ("") means undefined. If `true`, the pre-flight response includes the `Access-Control-Allow-Credentials=true` header. The default value is `true`. * `max-age`: Controls the cache duration for pre-flight responses. diff --git a/src/reference/asciidoc/jms.adoc b/src/reference/asciidoc/jms.adoc index 9d8c4bfdca..61d8cc95ce 100644 --- a/src/reference/asciidoc/jms.adoc +++ b/src/reference/asciidoc/jms.adoc @@ -417,11 +417,10 @@ The message selector is: + The responding system is expected to return the inbound `myCorrelationHeader` in the reply `myCorrelationHeader`. -. A `reply-destination*` property is provided, no `` is provided, and `correlation-key="JMSCorrelationID*"`:: +. A `reply-destination*` property is provided, no `` is provided, and `correlation-key="JMSCorrelationID*"` (Note the `*` in the correlation key.) + -The gateway uses the value in the `jms_correlationId` header (if present) from the request message and inserts it in -the `JMSCorrelationID` header. +The gateway uses the value in the `jms_correlationId` header (if present) from the request message and inserts it in the `JMSCorrelationID` header. The message selector is: + `messageSelector = "JMSCorrelationID = '" + headers['jms_correlationId'] + "'"` @@ -470,7 +469,7 @@ The responding system is expected to return the inbound `myCorrelationHeader` in Since each gateway has a unique ID, each instance only gets its own replies. The complete correlation data is used to route the reply to the correct requesting thread. -. A `reply-destination*` property is provided, a `` is provided, and `correlation-key="JMSCorrelationID*"`* +. A `reply-destination*` property is provided, a `` is provided, and `correlation-key="JMSCorrelationID*"` + (Note the `*` in the correlation key) + diff --git a/src/reference/asciidoc/jmx.adoc b/src/reference/asciidoc/jmx.adoc index fadde4c9ef..cfa0cc7281 100644 --- a/src/reference/asciidoc/jmx.adoc +++ b/src/reference/asciidoc/jmx.adoc @@ -229,7 +229,7 @@ However, if the message flow was started by manually creating a Spring Integrati [[jmx-mbean-exporter]] ==== MBean Exporter -Spring Integration components may themselvesbe exposed as MBeans when the `IntegrationMBeanExporter` is configured. +Spring Integration components may themselves be exposed as MBeans when the `IntegrationMBeanExporter` is configured. To create an instance of the `IntegrationMBeanExporter`, define a bean and provide a reference to an `MBeanServer` and a domain name (if desired). You can leave out the domain, in which case the default domain is `org.springframework.integration`. The following example shows how to declare an instance of an `IntegrationMBeanExporter` and an associated `MBeanServer` instance: @@ -347,7 +347,7 @@ public class Namer implements ObjectNamingStrategy { ==== The `beanKey` argument is a `String` that contain the standard object name, beginning with the `default-domain` and including any additional static properties. -The preceding example moves the standard `type` part to `componentType` and sets the `type` to 'Integration', enabling selection of all Integration MBeans in one query:`"my.domain:type=Integration,*`. +The preceding example moves the standard `type` part to `componentType` and sets the `type` to 'Integration', enabling selection of all Integration MBeans in one query:`my.domain:type=Integration,*`. Doing so also groups the beans under one tree entry under the domain in such tools as VisualVM. NOTE: The default naming strategy is a https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/jmx/export/naming/MetadataNamingStrategy.html[`MetadataNamingStrategy`]. @@ -443,7 +443,7 @@ The `\!thing` pattern matches a bean named `!thing`. IntegrationMBeanExporter changes:: The `IntegrationMBeanExporter` no longer implements `SmartLifecycle`. -This means that `start()` and `stop()` operations are no longer available to registerand unregister MBeans. +This means that `start()` and `stop()` operations are no longer available to register and unregister MBeans. The MBeans are now registered during context initialization and unregistered when the context is destroyed. [[jmx-mbean-shutdown]] diff --git a/src/reference/asciidoc/overview.adoc b/src/reference/asciidoc/overview.adoc index 227c278584..fc16653329 100644 --- a/src/reference/asciidoc/overview.adoc +++ b/src/reference/asciidoc/overview.adoc @@ -610,7 +610,7 @@ On the other hand, the `ConsumerEndpointFactoryBean` delegates to an another fir The goal of the implementation of this interface is to handle the message consumed by the endpoint from the channel. All EIP components in Spring Integration are `MessageHandler` implementations (for example, `AggregatingMessageHandler`, `MessageTransformingHandler`, `AbstractMessageSplitter`, and others). The target protocol outbound adapters (`FileWritingMessageHandler`, `HttpRequestExecutingMessageHandler`, `AbstractMqttMessageHandler`, and others) are also `MessageHandler` implementations. -When you develop Spring Integration applications with Java configuration, you should look into the Spring Integration module to find an appropriate `MessageHandler` implementation to use for the `@ServiceActivator`\ configuration. +When you develop Spring Integration applications with Java configuration, you should look into the Spring Integration module to find an appropriate `MessageHandler` implementation to use for the `@ServiceActivator` configuration. For example, to send an XMPP message (see <<./xmpp.adoc#xmpp,XMPP Support>>) you should configure something like the following: ==== diff --git a/src/reference/asciidoc/sftp.adoc b/src/reference/asciidoc/sftp.adoc index 0473af179e..13f7782436 100644 --- a/src/reference/asciidoc/sftp.adoc +++ b/src/reference/asciidoc/sftp.adoc @@ -1212,7 +1212,7 @@ It is particularly useful for mget (for example: `local-directory-expression="'/ This attribute is mutually exclusive with the `local-directory` attribute. For all commands, the 'expression' property of the gateway holds the path on which the command acts. -For the `mget` command, the expression might evaluate to '*', meaning to retrieve all files, 'somedirectory/*', and other values that end with `*`. +For the `mget` command, the expression might evaluate to `*`, meaning to retrieve all files, `somedirectory/*`, and other values that end with `*`. The following example shows a gateway configured for an `ls` command: