diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd deleted file mode 100644 index 3aef53319f..0000000000 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd +++ /dev/null @@ -1,787 +0,0 @@ - - - - - - - - - - - Configures an endpoint that will publish an AMQP Message to the provided Exchange. - - - - - - - - - Unique ID for this adapter. - - - - - - - Message Channel to which Messages should be sent in order to have them converted and published to an AMQP Exchange. - If this attribute is not provided, the ID will be used to create a new DirectChannel, and then instead of using that - ID as the bean name of the EventDrivenConsumer instance that hosts the MessageHandler responsible for publishing the - AMQP Messages, that EventDrivenConsumer's bean name will be the ID plus the added suffix: ".adapter" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Configures an endpoint that will receive AMQP Messages sent to a given queue and then forward those messages to a Message Channel. - - - - - - - - - Message Channel to which converted Messages should be sent. If this attribute is not provided, the ID will - be used to create a new DirectChannel, and then instead of using that ID as the bean name of the Channel Adapter - instance, the bean name will be the ID plus the added suffix: ".adapter" - - - - - - - - - - - - - - - - - Configures a gateway that will publish an AMQP Message to the provided Exchange - and expect a reply Message. - - - - - - - - - Unique ID for this gateway. - - - - - - - Message Channel to which Messages should be sent in order to have them converted and published to an AMQP Exchange. - - - - - - - - - - - - Message Channel to which replies should be sent after being received from an AQMP Queue and converted. - - - - - - - - - - - - - - - - - - - - - - - - - - - Configures a gateway that will receive AMQP Messages sent to a given queue and then forward those messages to a Message Channel. - If a reply Message is returned, it will also send that to the 'replyTo' provide by the AMQP request Message. - - - - - - - - - Message Channel to which converted Messages should be sent. - - - - - - - - - - - - Message Channel where reply Messages will be expected. - - - - - - - - - - - - - - - - - - - - - - Creates a point-to-point channel that is backed by an AMQP Queue. - - - - - - - - - Indicate whether this channel should be message-driven (subscribable) or not (pollable). - - - - - - - Provide an explicitly configured queue name. If this is not provided, then a Queue will be created - implicitly with the same name as the channel itself (the "id" of this element). If this channel is - not message-driven, the implicit creation will require that either an AmqpAdmin instance has been - provided via the "amqp-admin" attribute or that the configured AmqpTemplate is an instance of RabbitTemplate. - If the channel is message-driven, the AmqpAdmin will be created using the underlying listener container's - ConnectionFactory. - - - - - - - An AmqpAdmin instance to use when declaring a Queue implicitly. This is only needed if an explicit - "queue-name" is not provided and the channel is not message-driven. Even then, if the referenced - AmqpTemplate is an instance of RabbitTemplate, the AmqpAdmin can be constructed from that template's - ConnectionFactory. - - - - - - - - - - - - - - - - - Creates a publish-subscribe-channel that is backed by an AMQP FanoutExchange. - Always message-driven (subscribable). - - - - - - - - - Reference to a FanoutExchange instance to which this channel should send Messages. If not provided, - a FanoutExchange will be declared with this channel's name prefixed by "si.fanout.". - A Queue will be declared automatically and bound to that exchange to handle the consumer role - of this channel. - - - - - - - - - - - - - - - - - Base type for 'channel' and 'publish-subscribe-channel'. - - - - - - - - - - - - - Unique ID for this Message Channel. - - - - - - - Flag to indicate whether this Message Channel should start automatically. - This only applies to a message-driven channel. Default is true. - - - - - - - - - - - Base type for the 'outbound-channel-adapter' and 'outbound-gateway' elements. - - - - - - - - -The fixed name of the AMQP Exchange to which Messages should be sent. If not provided, Messages will be sent to the default, no-name Exchange. - - - - - - -The exchange name to use when sending Messages evaluated as an expression on the message (e.g. 'headers.exchange'). By default, this will be an emtpy String. - - - - - - -The fixed routing-key to use when sending Messages. By default, this will be an empty String. - - - - - - -The routing-key to use when sending Messages evaluated as an expression on the message (e.g. 'payload.key'). By default, this will be an empty String. - - - - - - - - - - - - - - - -The order for this consumer when multiple consumers are registered thereby enabling load-balancing and/or failover. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Base type for the 'inbound-channel-adapter' and 'inbound-gateway' elements. - - - - - - Unique ID for this adapter. - - - - - - - - Message Channel to which error Messages should be sent. - - - - - - - - - - - - - - - - - - - - - - - - - - MessageConverter to use when receiving AMQP Messages. - - - - - - - - - - - - (or @Bean) syntax. You cannot use the XML namespace support because it requires - attributes such as queue names to be specified on a child element and, as stated above, the - container must not have a MessageListener defined. - ]]> - - - - - - - - - - - Names of the AMQP Queues from which Messages should be consumed (comma-separated list). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Flag to indicate that channels created by this component will be transactional. - - - - - - - Reference to the Rabbit ConnectionFactory to be used by this component. - - - - - - - - - - - - MessagePropertiesConverter to use when receiving AMQP Messages. - - - - - - - - - - - - - - Attributes for a RabbitTemplate. This does not include the exchange, queue, or routingKey properties - since those may or may not be exposed for configuration depending on what type of component uses this - attribute group. This group also does not include any of the properties that are shared with the - SimpleMessageListenerContainer, such as channelTransacted, connectionFactory, and messagePropertiesConverter. - - - - - - The encoding to use when converting between byte arrays and Strings in message properties. - - - - - - - Reference to a MessageConverter to be used by this RabbitTemplate. - - - - - - - - - - - - - - Attributes for a SimpleMesssageListenerContainer's properties other than queues, queueNames, messageListener, and - autoStartup which may or may not be exposed for configuration depending on what type of component uses this attribute group. - This group also does not include any of the properties that are shared with RabbitTemplate, such as channelTransacted, - connectionFactory, and messsagePropertiesConverter. - - - - - - Acknowledge Mode for the MessageListenerContainer. - - - - - - - - - - - - - - - - - - Array of AOP Advice instances to be applied to the MessageListener. - - - - - - - - Specify the number of concurrent consumers to create. Default is 1. - Raising the number of concurrent consumers is recommended in order to scale the consumption of messages coming in - from a queue. However, note that any ordering guarantees are lost once multiple consumers are registered. In - general, stick with 1 consumer for low-volume queues. - - - - - - - ErrorHandler to be configured on the underlying MessageListener container. - - - - - - - - - - - - - Set whether to expose the listener Rabbit Channel to a registered ChannelAwareMessageListener as well as - to RabbitTemplate calls. - - - - - - - - - The lifeycle phase determining the start/stop order of the underlying listener container. - - - - - - - - - Specifies how many messages to send to each consumer in a single request. Often this can be set quite high - to improve throughput. It should be greater than or equal to the tx-size value. - - - - - - - - - The timeout for each attempt by a consumer to receive the next message. - - - - - - - - - The interval between recovery attempts, in milliseconds. The default is 5000 ms, that is, 5 seconds. - - - - - - - - - The time to wait for workers in milliseconds after the container is stopped, and before the connection is forced closed. - - - - - - - - - Reference to the Executor to be used for running Consumer threads. - - - - - - - - - - - - The TransactionAttribute to use when the Consumer receives the AMQP Message and the Listener is invoked - within a transaction. This is only applicable when a TransactionManager has been configured. - - - - - - - - - - - - The PlatformTransactionManager to use when the Consumer receives the AMQP Message and the Listener is invoked. - - - - - - - - - - - - How many messages to process in a single transaction (if the channel is transactional). For best results it should be - less than or equal to the prefetch count. - - - - - - - diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd index 94ec420461..3aef53319f 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> @@ -18,91 +18,76 @@ - - - - Unique ID for this adapter. - - - - - - - Message Channel to which Messages should be sent in order to have them converted and published to an AMQP Exchange. - If this attribute is not provided, the ID will be used to create a new DirectChannel, and then instead of using that - ID as the bean name of the EventDrivenConsumer instance that hosts the MessageHandler responsible for publishing the - AMQP Messages, that EventDrivenConsumer's bean name will be the ID plus the added suffix: ".adapter" - - - - - - - - - - - - The fixed name of the AMQP Exchange to which Messages should be sent. If not provided, Messages will be sent to the default, no-name Exchange. - - - - - - - The exchange name to use when sending Messages evaluated as an expression on the message (e.g. 'headers.exchange'). By default, this will be an emtpy String. - - - - - - - The fixed routing-key to use when sending Messages. By default, this will be an empty String. - - - - - - - The routing-key to use when sending Messages evaluated as an expression on the message (e.g. 'payload.key'). By default, this will be an empty String. - - - - - - - - - - - - - - - - The order for this consumer when multiple consumers are registered thereby enabling load-balancing and/or failover. - - - - - - - - - - - - - - - - - + + + + + + Unique ID for this adapter. + + + + + + + Message Channel to which Messages should be sent in order to have them converted and published to an AMQP Exchange. + If this attribute is not provided, the ID will be used to create a new DirectChannel, and then instead of using that + ID as the bean name of the EventDrivenConsumer instance that hosts the MessageHandler responsible for publishing the + AMQP Messages, that EventDrivenConsumer's bean name will be the ID plus the added suffix: ".adapter" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -142,112 +127,77 @@ this list can also be simple patterns to be matched against the header names (e. - - - - Unique ID for this gateway. - - - - - - - Message Channel to which Messages should be sent in order to have them converted and published to an AMQP Exchange. - - - - - - - - - - - - Message Channel to which replies should be sent after being received from an AQMP Queue and converted. - - - - - - - - - - - - The name of the AMQP Exchange to which Messages should be sent. If not provided, Messages will be sent to the default, no-name Exchange. - - - - - - - The exchange name to use when sending Messages evaluated as an expression on the message (e.g. 'headers.exchange'). By default, this will be an emtpy String. - - - - - - - The routing-key to use when sending Messages. By default, this will be an empty String. - - - - - - - The routing-key to use when sending Messages evealuated as an expression on the message (e.g. 'payload.key'). By default, this will be an empty String. - - - - - - - - - - - - - - - - The order for this consumer when multiple consumers are registered thereby enabling load-balancing and/or failover. - - - - - - - - - - - - - - - - - - - - - - + + + + + + Unique ID for this gateway. + + + + + + + Message Channel to which Messages should be sent in order to have them converted and published to an AMQP Exchange. + + + + + + + + + + + + Message Channel to which replies should be sent after being received from an AQMP Queue and converted. + + + + + + + + + + + + + + + + + + + + @@ -287,9 +237,9 @@ this list can also be simple patterns to be matched against the header names (e. - @@ -410,6 +360,94 @@ this list can also be simple patterns to be matched against the header names (e. + + + + + + + Base type for the 'outbound-channel-adapter' and 'outbound-gateway' elements. + + + + + + + + +The fixed name of the AMQP Exchange to which Messages should be sent. If not provided, Messages will be sent to the default, no-name Exchange. + + + + + + +The exchange name to use when sending Messages evaluated as an expression on the message (e.g. 'headers.exchange'). By default, this will be an emtpy String. + + + + + + +The fixed routing-key to use when sending Messages. By default, this will be an empty String. + + + + + + +The routing-key to use when sending Messages evaluated as an expression on the message (e.g. 'payload.key'). By default, this will be an empty String. + + + + + + + + + + + + + + + +The order for this consumer when multiple consumers are registered thereby enabling load-balancing and/or failover. + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -470,13 +508,17 @@ this list can also be simple patterns to be matched against the header names (e. - + + Note that this means that the external listener container must be configured using standard Spring + (or @Bean) syntax. You cannot use the XML namespace support because it requires + attributes such as queue names to be specified on a child element and, as stated above, the + container must not have a MessageListener defined. + ]]> @@ -527,7 +569,7 @@ this list can also be simple patterns to be matched against the header names (e. - Reference to the Rabbit ConnectionFactory to be used by this component. + Reference to the Rabbit ConnectionFactory to be used by this component. @@ -583,7 +625,7 @@ this list can also be simple patterns to be matched against the header names (e. - Attributes for a SimpleMesssageListenerContainer's properties other than queues, queueNames, messageListener, and + Attributes for a SimpleMesssageListenerContainer's properties other than queues, queueNames, messageListener, and autoStartup which may or may not be exposed for configuration depending on what type of component uses this attribute group. This group also does not include any of the properties that are shared with RabbitTemplate, such as channelTransacted, connectionFactory, and messsagePropertiesConverter. @@ -692,7 +734,7 @@ this list can also be simple patterns to be matched against the header names (e. - + diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd deleted file mode 100644 index ea0a7ebe9e..0000000000 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd +++ /dev/null @@ -1,3921 +0,0 @@ - - - - - - - - - - - - - - Enables annotation support for Message Endpoints. - - - - - - - Default output channel for the @Publisher annotation support. - - - - - - - - - - - - - - - Allows you to configure org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory - This implementation of org.springframework.integration.transaction.TransactionSynchronizationFactory - allows you to configure SpEL expressions, with their execution being coordinated (synchronized) with a - transaction - see {TransactionSynchronization}. Expressions for before-commit, after.-commit, and after-rollback - are supported, together with a channel for each where the evaluation result (if any) will be sent. - For each sub-element you can specify 'expression' and/or 'channel' attributes. - If only the 'channel' attribute is present the received Message will be sent there as part of a particular synchronization scenario. - If only the 'expression' attribute is present and the result of an expression is a non-Null value, a Message with the - result as the payload will be generated and sent to a default channel (NullChannel) and will appear in the logs. - If you want the evaluation result to go to a specific channel add a 'channel' attribute. If the result of an expression is null - or void, no Message will be generated. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines the ApplicationEventMulticaster to use for this - ApplicationContext. - The "task-executor" - reference is optional. If not provided, an - instance of - ThreadPoolTaskExecutor will be created by default. - - - - - ). - ]]> - - - - - - - - - - - - - - Defines a Point-to-Point MessageChannel. - - - - - - - - - - - - - - - - Identifies this channel as a Queue style - channel - - - - - - - Identifies this channel as a Queue style - channel where messages could be prioritized - based on custom logic - - - - - - - Provides MessageDispatcher configuration - (i.e., failover, load-balancing, task-executor) - - - - - - - - - - - - - - - - - - Defines a queue for messages. If 'capacity' is specified, it will be a - bounded queue. - A custom Queue - implementation can be injected using the 'ref' - attribute. - - - - - - Capacity for this queue. Default capacity is 0 which means - this queue will accumulate as many - messages as available resources allow. - - - - - - - Reference to a MessageGroupStore that can be used to buffer the messages. If a message store is - specified then it will store messages for this channel with a correlation key equal to the - channel name. If you need - more control over the correlation key (e.g. two channels in the same - application share a name), then you need to - look to the queue implementation itself and provide an - explicit instance via the "ref" attribute, or else maybe the - message store has a way to specify a region or similar additional - tag for messages. This attribute is - mutually - exclusive with the "ref" attribute (only one can be specified). - - - - - - - - - - - - Reference to a BlockingQueue that can be used to buffer the messages. This attribute is - mutually - exclusive with the "message-store" attribute (only one can be specified). - - - - - - - - - - - - - - Defines a queue with priority-ordering for message reception. - - - - - - Capacity for this queue. Default capacity is 0 which means - this queue will accumulate as many - messages as available resources allow. - - - - - - - - - - - - - - - - Defines a rendezvous queue where a sender will block until the receiver - arrives or vice-versa. - - - - - - - - Defines the dispatching configuration for a non-buffering channel - (i.e. one without a queue). - - - - - - Defines a load-balancing strategy for the channel's dispatcher. - The default is a round-robin load - balancer. - - - - - - - - [DEFAULT] Defines a Round Robin dispatching strategy which allows - load balancing of messages - between multiple Message Handlers. Which - message - handler receives the message first is determined by the 'order' - attribute - of such Message Handler. - - - - - - - No LoadBalancingStrategy will be used. - - - - - - - - - - Specifies whether this dispatcher has failover enabled. By default, - failover will be enabled. Set - this to 'false' to disable it. - When enabled and message delivery to the primary Message Handler fails, - an attempt - will be made to deliver the message to the next handler - and so on... - Primary, secondary etc... is determined by the - load-balancing strategy in - use - (e.g. round-robin). If no load-balancer strategy is configured, the - order will - be fixed - in a sequence determined by the 'order' attribute on the - Message Handlers - (or the @Ordered annotation on adapted - methods). - - - - - - ). - ]]> - - - - - - - - - - - - - - Defines a Publish-Subscribe channel that broadcasts messages to its - subscribers. - - - - - - - - - - - - - - - - - - - - ). - ]]> - - - - - - - - - - - - - - - - - - - - - - - Specify whether Exceptions thrown by any subscribed handler should be - ignored (only logged). - - - - - - - Specify whether the sequence size, sequence number, and correlation id - headers should be set on - Messages that are sent through this channel. - - - - - - - - - - - - - Defines a message channel. - - - - - - - - - - - - - - - This attribute is DEPRECATED. Please use the dispatcher sub-element - instead. - - - - - - - - Enables failover, but disables load-balancing. - See the dispatcher sub-element for more - information. - - - - - - - - - - - - Defines a Messaging Gateway. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines a Messaging Gateway to be used within a chain. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines a Channel Adapter that receives from a MessageSource and sends to a - MessageChannel. - - - - - - - - - - - - - - - - - - - - - - Maximum amount of time in milliseconds to wait when sending a message to the channel if such channel may block. - For example, a Queue Channel can block until space is available if its maximum capacity has been reached. - - - - - - - - - - Defines a Channel Adapter that receives Resource(s) and sends them to a - MessageChannel identified via 'channel' attribute. - - - - - - - - - - - - Component identifier - - - - - - - Channel where Message will be sent to - - - - - - - Reference to the implementation of org.springframework.integration.util.CollectionFilter. - - - - - - - - - - - - Lifecycle attribute signaling if this component should be started during Application Context startup. - - - - - - - Location pattern expression (e.g., "/**/*.txt") - - - - - - - - Reference to a org.springframework.core.io.support.ResourcePatternResolver. - - - - - - - Maximum amount of time in milliseconds to wait when sending a message to the channel if such channel may block. - For example, a Queue Channel can block until space is available if its maximum capacity has been reached. - - - - - - - - - - Defines a Channel Adapter that receives from a MessageChannel and passes to - a method-invoking - MessageHandler. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Provide a name for the logger. This is useful when there are multiple logging Channel Adapters configured, - and you would like to differentiate them within the actual log. By default the logger name will be the - fully qualified class name of the LoggingHandler implementation. - - - - - - - - - - - - - - - - - - - - - - - - - A reference to a bean defined in the application context. - - - - - - - - - - - - A method defined on the bean referenced by 'ref' attribute - - - - - - - SpEL expression to be evaluated for each triggered execution. - The result of the evaluation will be - passed as the payload of - the Message that is sent to the MessageChannel. - - - - - - - - - - - - - - - - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where - messages will be sent to by this adapter (e.g., inbound-channel-adapter). - - - - - - - Lifecycle attribute signaling if this component should be started during Application Context startup. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a channel. This is particularly relevant when that channel - is using a "failover" dispatching strategy. It has no effect when this - endpoint itself is a Polling Consumer for a channel with a queue. - - - - - - - - - - - - - - - Defines an endpoint for exposing any bean reference as a service that - receives request Messages - from an 'input-channel' and may send reply - Messages to an 'output-channel'. The 'ref' may point to an instance - that - has either a single public method or a method with the - @ServiceActivator annotation. Otherwise, the 'method' - attribute - should be provided along with 'ref'. - - - - - - - - - - Specify whether the service method must return a non-null value. This value will be - FALSE by - default, but if set to TRUE, a MessageHandlingException will be thrown when - the underlying service method (or - expression) returns a NULL value. - - - - - - - - - - - - Base type for Message-handling endpoints. - - - - - - - - - - - A reference to a bean that implements the handler. - The bean can be an implementation of the MessageHandler interface or a POJO - - - - - - - - - - - - A method defined on the bean referenced by 'ref' attribute - - - - - - - - - Base type for Message Handlers. - - - - - - - - - - - - - A reference to a bean that implements the handler. - The bean can be an implementation of the MessageHandler interface or a POJO - - - - - - - - - - - - A method defined on the bean referenced by 'ref' attribute - - - - - - - - - - - Defines an endpoint that passes a Message to its request-channel - and then expects a reply Message. The reply Message then becomes - the root object for evaluation of expressions to enrich the - target payload. - - - - - - - - - - - - - - - - - - Each property sub-element provides the name of a property (via the required 'name' attribute). - That property should be settable on the target payload instance. Exactly one of the 'value' - or 'expression' attributes must be provided as well. The former for a literal value to set, - and the latter for a SpEL expression to be evaluated. The root object of the evaluation - context is the Message that was returned from the flow initiated by this enricher. - - - - - - - - - Channel to which a Message will be sent to get the data to use - for enrichment. This attribute is optional. Not specifying a - 'request-channel' is useful in situations, where only static - values shall be used for enrichment using the 'property' - sub-element. - - - - - - - - - - - - Channel where a reply Message is expected. This is optional; typically the auto-generated - temporary reply channel is sufficient. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Boolean value indicating whether any payload that implements Cloneable should be cloned - prior to sending the Message to the request chanenl for acquiring the enriching data. - The cloned version would be used as the target payload for the ultimate reply. - - If the payload does NOT implement 'Cloneable', then setting this - attribute to 'true' has NO effect. - - Default is false. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an endpoint that passes a Message to the output-channel after a - delay. The delay may - be - retrieved from a Message header or else fallback to the - 'default-delay' of this endpoint. - - - - - - - - - - - - - - - - - - - 'transactional' and 'advice-chain' elements specify the configuration List of AOP Advice - to proxy DelayHandler's 'release Message task'. - - - - - - - - - 'id' value is used: - - as the 'AbstractEndpoint' bean 'id' if this tag is defined as root element. - - as the DelayHandler bean alias together with suffix '.handler' - - as the 'messageGroupId' property of DelayHandler together with suffix '.messageGroupId' - in the operations of the MessageGroupStore for scheduling delayed messages. - - - - - - - Specify the default delay in milliseconds. This value can be set to 0 - if the only Messages - that - should be delayed are those with a particular header (in that - case, be sure to provide - a value for the - 'delay-header-name' attribute). - - - - - - - Specify the name of the header that should contain the delay value. - This value can either - represent the number of milliseconds to delay counting from the current - time or it can be an - absolute Date until - which the Message should be delayed. - - - - - - - Provide a reference to the TaskScheduler instance to which - this endpoint should - delegate when scheduling the sending of delayed Messages. If not - provided, the default scheduler - registered in the ApplicationContext {ThreadPoolTaskScheduler} will be - used. - - - - - - - - - - - - Provide a reference to the MessageStore instance that should be used - to store Messages while - awaiting the delay. - - - - - - - - - - - - - - Defines an endpoint that passes a Message to the - output-channel without - modifying it. - - - - - - - - - - - - - - - Defines an endpoint composed of a chain of Message - Handlers. - - - - - - - - - - - - - The Lifecycle attribute determining the start/stop order - of the underlying MessageHandlerChain. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines a top-level poller. - - - - - - - - - - - - - - - - Defines the configuration metadata for a poller. - - - - - - - - - - - Fixed delay trigger (in milliseconds). - - - - - - Allows this poller to reference another instance of a top-level poller. - [IMPORTANT] - This attribute is only allowed on inner poller definitions. - Defining this attribute on a top-level poller definition will result in a configuration exception. - - - - - - Fixed rate trigger (in milliseconds). - - - - - - - - - - - - - - - - Cron trigger. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines a MessageSelector chain. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Provides a MessageSelector reference. If a method attribute is set the - referred bean doesn't need - to implement the MessageSelector - interface. - - - - - - - - - - - - - - - - - - - - - - - - - - Defines a HeaderEnricher endpoint for values defined in the MessageHeader. - - - - - - - - - - - - - - - - - Shortcut to specify value for 'replyChannel' header. - Can be a 'ref' to the MessageChannel, a 'value' as name of the MessageChannel, - or some valid SpEL 'expression' which returns the MessageChannel reference or name of the MessageChannel. - - - - - - - Shortcut to specify value for 'errorChannel' header. - Can be a 'ref' to the MessageChannel, a 'value' as name of the MessageChannel, - or some valid SpEL 'expression' which returns the MessageChannel reference or name of the MessageChannel. - - - - - - - Shortcut to specify value for 'correlationId' header - - - - - - - Shortcut to specify value for 'expirationDate' header (java.lang.Long) - - - - - - - Shortcut to specify value for 'priority' header when using PriorityChannel - - - - - - - Integer value identifying the value of the 'priority' header. - - - - - - - Boolean value to indicate whether this header value should overwrite - an existing header - value - for the same name. - - - - - - - - - - - - Element that accepts any user-defined header name/value pair. - - - - - - - Allows you to configure Message Poller if this endpoint is a Polling Consumer - - - - - - - - Specify the default boolean value for whether to overwrite existing - header values. This will - only - take effect for - sub-elements that do not provide their own 'overwrite' attribute. If the - 'default-overwrite' - attribute is not - provided, then the specified header values will NOT overwrite any - existing ones with the same - header - names. - - - - - - - - - - Specify whether null values, such as might be returned from an expression evaluation, - should be - skipped. The default value is true. Set this to false if a null value should - trigger removal of the corresponding - header instead. - - - - - - - - - - Reference to an Object to be invoked for header values. - The 'method' attribute is required - along - with this. - - - - - - - - - - Method to be invoked on the referenced Object as specified by the - 'ref' attribute. The method - should return a Map with String-typed keys. - - - - - - - - - - - - - - Defines a Message Header with a literal value or object reference. - - - - - - - - Name of the header to be added. - - - - - - - - - - - Provides a header value for the given header name. Requires - exactly one of the 'ref', 'value', or - 'expression' attributes. - The 'type' attribute allows for the specification of the expected - type when using a 'value' - or 'expression', but it is optional. - Also for a header value one of 'bean', 'script' or - 'expression' sub-elements can be defined, but they are mutually exclusive - with the attributes defined above. - - - - - - - - - - - - Literal value to be associated with the given header name. - - - - - - - Expression to be evaluated at runtime to determine the header value. - The EvaluationContext will - include variables for 'payload' and - 'headers'. - - - - - - - - - - - - - - - - - Reference to be associated with the given header name. - - - - - - - - - - Name of a method to be invoked on the referenced target object. - - - - - - - - - - - - Boolean value to indicate whether this header value should overwrite an - existing header value for - the same name. - - - - - - - - - - - - Defines a HeaderFilter endpoint to remove values defined in the MessageHeaders. - - - - - - - - - - - - - - - - Specify one or more header names (as a comma separated list) to - be removed from the - MessageHeaders - of the Message being handled. - - - - - - - Boolean flag that specifies whether values provided in 'header-names' should be treated as - match patterns or literal values. For example header-names='foo*' would mean remove all - headers that begin with 'foo' including the header named 'foo*'. However if you want to - treat '*' as literal value setting this flag to FALSE will not perform pattern match and - the only header that will be removed is the one that is an exact match. - - - - - - - - - Defines a Transformer. - - - - - - - - - - - - - - - Defines a Transformer that converts any Object payload to a String by - invoking its toString() - method. - - - - - - - - - - - - - - Defines a Transformer that converts any Object payload to a SpEL Map. - - - - - - - - - - - - - - Defines a Transformer that converts SpEL-based Map to an object. - - - - - - - - - - - - - - - - - - - - - - - - The name of the bean to be produced by this transformer. The bean MUST BE of scope 'prototype'. - NOTE: This attribute is mutually-exclusive with 'type'. - - - - - - - - - - - - - - Defines a Transformer that converts any Object payload to a JSON String. - - - - - - - - - - - - - - - - - - before or after the transformer. - ]]> - - - - - - Reference to a Jackson ObjectMapper instance to be provided optionally - if the default ObjectMapper - configuration is not desirable. - - - - - - - - - - - - - - Defines a Transformer that converts a JSON String to an object. - - - - - - - - - - - - - - - - - - - - - - - - Reference to a Jackson ObjectMapper instance to be provided optionally - if the default ObjectMapper - configuration is not desirable. - - - - - - - - - - - - - - Defines a Transformer that converts an object payload to a byte array. - - - - - - - - - - - - - - - - - - - Reference to a Serializer instance to convert from an object to a byte array. - This is optional. - The default will use standard Java serialization. - - - - - - - - - - - - - - Defines a Transformer that converts a byte array to an object. - - - - - - - - - - - - - - - - - - - Reference to a Deserializer instance to convert from a byte array to an object. - This is optional. - The default will use standard Java deserialization. - - - - - - - - - - - - - - Defines a Transformer that converts an RFC5424 packet to a Map. - - - - - - - - - - - - - Defines a Transformer that stores a Message and returns a new - Message, whose payload is the id of the stored Message. - - - - - - - - - - - - - - - - - - - - - - - - - - Defines a Transformer that accepts a Message whose payload is a - UUID and retrieves the Message associated with that id from a - MessageStore if available (else null). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If set to 'true' the Message will be removed - from the MessageStore by this transformer. - Useful when Message can be 'claimed' only - once. DEFAULT is 'false'. - - - - - - - - - - - - - - - Reference to the MessageStore to be used by this Claim Check - transformer. If not specified, the default reference will be - to a bean named 'messageStore'. - - - - - - - - - - - - - - - - - - - - - Defines a Message Filters that is used to decide whether a Message should be passed - along or dropped based on some criteria - - - - - - - - - - - - - - - - - - - - - - - The channel where the filter will send the messages that were dropped - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The "ref" attribute references the bean name of a custom - Router implementation. Typically that implementation will - be a simple POJO, but it may extend AbstractMessageRouter. - - Provide the "method" attribute as well to clarify which - method should be invoked, Alternatively, the "ref" attribute - may point to an instance that contains the @Router annotation - on one of its methods. - - Instead of using the "ref" attribute you may also provide - the custom Router implementation as an inner bean - definition. - - However, keep in mind that using both the "ref" attribute - and an inner handler definition in the same Router - configuration is not allowed, as it creates an - ambiguous condition, and an Exception will be thrown. - - Additionally, instead of using "ref" and "method" at all, - you can use the "expression" attribute (see description below). - - - - - - - - - - - - When implementing a custom Router using a plain POJO - the "ref" attribute may be combined with an explicit - method name using the "method" attribute. - - The referenced method may return either a MessageChannel - or a String type. Additionally, the method may return - either a single value or a collection. If a collection - is returned, the reply message will be sent to - multiple channels. - - Specifying a "method" attribute applies the same behavior - as when using the @Router annotation on a single method - within the object pointed to by the "ref". - - - - - - - - - - - - SpEL Expression to be evaluated at runtime. Allows you - to implement simple computations without implementing - a custom POJO router. Generally, the SpEL expression is - evaluated and the result is mapped to a channel using - "mapping" sub-elements. - - However, if no "mapping" sub-element is present, the - SpEL Expression will evaluate to a channel name directly. - - A SpEL expression may also return a Collection. Whenever - the expression returns multiple channel values the - Message will be forwarded to each channel. - - Note that SpEL supports bean-references within expressions - using the @ sign. This enables more sophisticated mapping - of Message content to method arguments, e.g.: - expression="@someBean.someMethod(payload.foo, headers.bar)" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An expression to be evaluated to determine if this recipient - should be included in the recipient list for a given input - Message. The evaluation result of the expression must be a boolean. - If this attribute is not defined, the channel will always be - among the list of recipients. - - - - - - - - - - - - - - - - - An expression to be evaluated to determine if this recipient - should be included in the recipient list for a given input - Message. The evaluation result of the expression must be a boolean. - If this attribute is not defined, the channel will always be - among the list of recipients. - - - - - - - - - - - - - - - - - - - - - - - - - ). - ]]> - - - - - - - - - - - - - - - - ) - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - ) - - The most specific matching exception type is determined - by navigating the hierarchy of 'exception causes' - (e.g., payload.getCause()). - ]]> - - - - - - - - - - - - - - - - ) - - The most specific matching exception type is determined - by navigating the hierarchy of 'exception causes' - (e.g., payload.getCause()). - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A value of the evaluation token that will be mapped to a channel reference - (e.g., mapping value='foo' channel='myChannel') - - - - - - - A reference to a bean that defines a Message Channel - (e.g., mapping value='foo' channel='myChannel') - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An expression to be evaluated to determine if this recipient - should be included in the recipient list for a given input - Message. The evaluation result of the expression must be a boolean. - If this attribute is not defined, the channel will always be - among the list of recipients. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lifecycle attribute signaling if this component should be - started during Application Context startup. Defaults to true. - - - - - - - - - - - - - - - The receiving Message channel of this endpoint - - - - - - - - - - - - - - - - - Reference to the channel where Messages should be sent if - channel resolution fails to return any channels. If no - default output channel is provided, the router will throw an - Exception. - - If you would like to silently drop those messages instead, - add the "nullChannel" as the default output channel attribute - value. - - - - - - - - - - - - Specify the maximum amount of time in milliseconds to wait - when sending Messages to the target MessageChannels. By - default the send will block indefinitely. - - - - - - - - - - - - - - - - - - - - - - - - - Specify whether sequence number and size headers should be added to each - Message. Defaults to false. - - - - - - - - - - Specify whether channel names must always be successfully resolved - to existing channel instances. - - If set to 'true', a MessagingException will be raised in case - the channel cannot be resolved. Setting this attribute to 'false', - will cause any unresovable channels to be ignored. - - If not explicitly set, 'resolution-required' will - default to 'true'. - - - - - - - - - - - - Defines a Splitter. - - - - - - - - - - - - - - - - - - Specify whether the splitter method must return a non-null value. This value will be - FALSE by default, but if set to TRUE, a MessageHandlingException will be thrown when - the underlying service method (or expression) returns a NULL value. - - - - - - - Set this flag to false to prevent adding sequence related headers in this splitter. - This can be convenient in cases where the set sequence numbers conflict with downstream - custom aggregations. - - - - - - - Provide one or more delimiters (as a single String value, e.g. delimiters=",;:") for - tokenizing String-typed payload values. This attribute is only allowed if no 'ref' or - 'expression' have been provided since that is when the DefaultMessageSplitter would - be used, and it's the implementation that contains the "delimiters" property. - - - - - - - - - - - Defines an aggregating message endpoint. - - - - - - - - - - - - - - - - - - A SpEL expression to be evaluated against the input message list as its root object. - - - - - - - Boolean flag specifying if MessageGroup should be removed once completed. Useful for - handling late arrival use cases where messages arriving with the correlationKey that - is the same as the completed MessageGroup will be discarded. Default is 'false' - - - - - - - - - - - - - - - - - - - A reference to a bean that implements the decision algorithm as to whether a given - message group is complete. The bean can be an implementation of the - CorrelationStrategy interface or a POJO. - - - - - - - - - - - - A method defined on the bean referenced by correlation-strategy, that implements the - correlation decision algorithm - - - - - - A SpEL expression which implements correlation decision - algorithm to apply to the Message (e.g., payload.getPerson().getId() - correlate - based on the 'id' of the 'person' attribute of the message payload object) - - - - - - - - - - - A reference to a bean that implements the release strategy. - The bean can be an implementation of the - ReleaseStrategy interface or a POJO - - - - - - - - - - - - A method defined on the bean referenced by release-strategy, that implements the completion - decision algorithm. - - - - - - A SpEL expression to evaluate against a root object that is the Collection of messages within the message group (e.g, size() > 6) - - - - - - - - - - - The channel where the aggregator will send the messages that timed out (if send-partial-results- - on-expiry is 'false'). - - - - - - - Reference to a MessageGroupStore for holding - state in between message processing. The default - is to use a volatile in-memory store, which means that unprocessed messages - will be lost if the JVM exits. To customize - the expiry of incomplete message groups configure the message store. - - - - - - - - - - - - Specifies whether messages that expired should be aggregated and sent to the 'output-channel' or 'replyChannel'. - Messages are expired when their containing MessageGroup expires. One of the ways of expiring MessageGroups is by - configuring a MessageGroupStoreReaper. However MessageGroups can alternatively be expired by simply calling - MessageGroupStore.expireMessageGroup(groupId). That could be accomplished via a ControlBus operation - or by simply invoking that method if you have a reference to the MessageGroupStore instance. - - - - - - - - - - - Defines a resequencing message endpoint. - - - - - - - - - - - - - - - - - - Comparator for messages used to sort the sequence when released. Defaults to comparing - the - sequence number header. - - - - - - - - - - - - Flag to say that partial sequences can be released (e.g. 1-4 of 10). - Defaults to true, so the - sequence has to be complete before any messages - are released. - This is mutually exclusive with the release-strategy - attribute (either or none can be specified , but not both). - - - - - - - - - - - Defines a list of interceptors. Each element may be a ChannelInterceptor, - ref, or inner-bean. - - - - - - - - Reference to a bean in this Application Context that implements ChannelInterceptor - - - - - - - - - - - - Reference to a bean in this Application Context that implements ChannelInterceptor - - - - - - - - - Alows you to configure a Wire Tap interceptor that will send a copy of the message to a - channel identified by 'channel' attribute. - - - - - - - - - - - - Defines a Wire Tap Channel Interceptor. - - - - - - - - - - - - - - - - A reference to a bean in the Application Context - which implements MessageSelector that must accept a message for it to be - sent to the intercepting channel - - - - - - - The timeout for sending the message to the intercepting channel - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A SpEL expression to be evaluated against the input Message as its root object. - - - - - - - - - - - - The key for retrieving the expression from an ExpressionSource. - - - - - - - The reference to an ExpressionSource. - - - - - - - - - - - - - - - - - - - - - - - - - Defines a MessagePublishingInterceptor which allows you to generate messages - as a by-product of - method invocations on Spring configured components. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [REQUIRED] Channel name(s) or patterns. To specify more than one channel use - ','  - (e.g., - channel-name-pattern="input*, foo, bar") - - - - - - - [OPTIONAL] Specifies the order in which this interceptor will be - added to the existing channel - interceptors (if any). - Negative value (e.g., -2) will signify BEFORE existing interceptors (if any). Positive - value (e.g., 2) - will signify AFTER existing interceptors (if any) - - - - - - - - - - - - Allows you to define channel interceptors to be applied globally. - - - - - - - - - - [REQUIRED] Channel name(s) or patterns. To specify more than one channel use - ','  - (e.g., - channel-name-pattern="input*, foo, bar") - - - - - - - [OPTIONAL] Specifies the order in which this interceptor will be - added to the existing channel - interceptors (if any). - Negative value (e.g., -2) will signify BEFORE existing iinterceptors (if any). Positive - value (e.g., 2) - will signify AFTER existing interceptors (if any) - - - - - - - - - - - - - - - - - Allows you to register Converters (implementation of the Converter interface) that will -be automatically registered with the ConversionService. ConversionService itself does not have to be -explicitly defined since the default ConversionService will be registered under the name 'integrationConversionService' -unless bean with this name is already registered. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Identifies the Message channel where Message will be sent after it's being processed by this endpoint - - - - - - - Specify the maximum amount of time in milliseconds to wait when sending a reply - Message to the - output channel. By default the send will block for one second. - - - - - - - - - - - - The receiving Message channel of this endpoint - - - - - - - - - - - - Lifecycle attribute signaling if this component should be - started during Application Context startup. Defaults to true. - - - - - - - - - - - - - 'id' value: - - Identifies the underlying Spring bean definition (AbstractEndpoint) - - as MessageHandler bean alias together with suffix '.handler' - - - - - - - - - - - - - - - - - or poller - sub element. - Used to take action after the transaction completes () or after - the channel.send() is complete (). - ]]> - - - - ), - or after the transaction commits (). The #root variable of the - expression evaluation is the original message; a BeanResolver is also available. - ]]> - - - - - - - - - - - - - - - ), - or after the transaction rolls back (). The #root variable of the - expression evaluation is the original message; a BeanResolver is also available. - ]]> - - - - - - - - - - - - - - - - - - - diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd index 591d33b9cb..ea0a7ebe9e 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd @@ -35,6 +35,66 @@ + + + + Allows you to configure org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory + This implementation of org.springframework.integration.transaction.TransactionSynchronizationFactory + allows you to configure SpEL expressions, with their execution being coordinated (synchronized) with a + transaction - see {TransactionSynchronization}. Expressions for before-commit, after.-commit, and after-rollback + are supported, together with a channel for each where the evaluation result (if any) will be sent. + For each sub-element you can specify 'expression' and/or 'channel' attributes. + If only the 'channel' attribute is present the received Message will be sent there as part of a particular synchronization scenario. + If only the 'expression' attribute is present and the result of an expression is a non-Null value, a Message with the + result as the payload will be generated and sent to a default channel (NullChannel) and will appear in the logs. + If you want the evaluation result to go to a specific channel add a 'channel' attribute. If the result of an expression is null + or void, no Message will be generated. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50,12 +110,16 @@ + Provides the reference to a bean that implements + org.springframework.core.task.TaskExecutor which is used + when dispatching Messages to this channel's subscribers. + Also, when using a TaskExecutor, keep in mind that any + transaction active for the sender will NOT propagate to + the handler invocation since the TaskExecutor dispatches + to the handler on a separate Thread. Usually configured + using the 'task' namespace support provided by Spring + (e.g., ). + ]]> @@ -281,11 +345,15 @@ ). ]]> @@ -294,6 +362,7 @@ + @@ -324,15 +393,17 @@ - - - + ). + ]]> @@ -343,11 +414,16 @@ - + @@ -373,6 +449,7 @@ + @@ -390,9 +467,11 @@ @@ -718,7 +797,7 @@ - + @@ -772,11 +851,11 @@ - + - Reference to a org.springframework.core.io.support.ResourcePatternResolver. + Reference to a org.springframework.core.io.support.ResourcePatternResolver. @@ -791,7 +870,7 @@ - + Defines a Channel Adapter that receives from a MessageChannel and passes to @@ -799,79 +878,75 @@ MessageHandler. - - - - - - - Specifies the order for invocation when this endpoint is connected as a -subscriber to a channel. This is particularly relevant when that channel -is using a "failover" dispatching strategy. It has no effect when this -endpoint itself is a Polling Consumer for a channel with a queue. - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - Provide a name for the logger. This is useful when there are multiple logging Channel Adapters configured, - and you would like to differentiate them within the actual log. By default the logger name will be the - fully qualified class name of the LoggingHandler implementation. - - - - - - + + + + + + + + + + + + + + + Provide a name for the logger. This is useful when there are multiple logging Channel Adapters configured, + and you would like to differentiate them within the actual log. By default the logger name will be the + fully qualified class name of the LoggingHandler implementation. + + + + + + - - - - - + + + + - - - - - - + + + @@ -937,18 +1012,42 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + - + + + + + + + + + + + + + Specifies the order for invocation when this endpoint is connected as a + subscriber to a channel. This is particularly relevant when that channel + is using a "failover" dispatching strategy. It has no effect when this + endpoint itself is a Polling Consumer for a channel with a queue. + + + + + + + + + @@ -968,7 +1067,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1067,7 +1166,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1087,6 +1186,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. + @@ -1120,7 +1220,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. @@ -1129,7 +1229,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. @@ -1138,25 +1238,25 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1250,17 +1350,38 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + + + + - - - - + + + + 'transactional' and 'advice-chain' elements specify the configuration List of AOP Advice + to proxy DelayHandler's 'release Message task'. + + + + + + + + + 'id' value is used: + - as the 'AbstractEndpoint' bean 'id' if this tag is defined as root element. + - as the DelayHandler bean alias together with suffix '.handler' + - as the 'messageGroupId' property of DelayHandler together with suffix '.messageGroupId' + in the operations of the MessageGroupStore for scheduling delayed messages. + + + + Specify the default delay in milliseconds. This value can be set to 0 @@ -1291,10 +1412,9 @@ endpoint itself is a Polling Consumer for a channel with a queue. Provide a reference to the TaskScheduler instance to which this endpoint should delegate when scheduling the sending of delayed Messages. If not - provided, the default - will use a thread pool of - size - 1. + provided, the default scheduler + registered in the ApplicationContext {ThreadPoolTaskScheduler} will be + used. @@ -1317,14 +1437,6 @@ endpoint itself is a Polling Consumer for a channel with a queue. - - - - Specify whether tasks should be able to complete on shutdown. By - default this is 'false'. - - - @@ -1340,7 +1452,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1352,48 +1464,70 @@ endpoint itself is a Polling Consumer for a channel with a queue. - - - - - + + + + + + + + + + The Lifecycle attribute determining the start/stop order + of the underlying MessageHandlerChain. + + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1420,28 +1554,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - - - - - - - - - - - - - - - - - - - - - - + @@ -1597,7 +1710,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1857,7 +1970,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1896,7 +2009,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1913,7 +2026,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1927,7 +2040,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1941,7 +2054,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1983,7 +2096,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1993,6 +2106,21 @@ endpoint itself is a Polling Consumer for a channel with a queue. + + + before or after the transformer. + ]]> + + @@ -2018,7 +2146,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2060,7 +2188,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2095,7 +2223,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2121,6 +2249,17 @@ endpoint itself is a Polling Consumer for a channel with a queue. + + + + Defines a Transformer that converts an RFC5424 packet to a Map. + + + + + + + @@ -2138,7 +2277,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2166,7 +2305,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2232,7 +2371,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2940,7 +3079,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -2990,7 +3129,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3015,38 +3154,6 @@ is provided, the return value is expected to match a channel name exactly. - - - - - - - - - A reference to a bean that implements the release strategy. - The bean can be an implementation of the - ReleaseStrategy interface or a POJO - - - - - - - - - - - - A method defined on the bean referenced by release-strategy, that implements the completion - decision algorithm. - - - - - - A SpEL expression to evaluate against a root object that is the Collection of messages within the message group (e.g, size() > 6) - - @@ -3088,6 +3195,38 @@ is provided, the return value is expected to match a channel name exactly. based on the 'id' of the 'person' attribute of the message payload object) + + + + + + + + + A reference to a bean that implements the release strategy. + The bean can be an implementation of the + ReleaseStrategy interface or a POJO + + + + + + + + + + + + A method defined on the bean referenced by release-strategy, that implements the completion + decision algorithm. + + + + + + A SpEL expression to evaluate against a root object that is the Collection of messages within the message group (e.g, size() > 6) + + @@ -3141,7 +3280,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3318,14 +3457,67 @@ is provided, the return value is expected to match a channel name exactly. ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + @@ -3532,7 +3724,7 @@ unless bean with this name is already registered. @@ -3557,7 +3749,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -3578,7 +3770,6 @@ The list of component name patterns you want to track (e.g., tracked-components - @@ -3634,4 +3825,97 @@ endpoint itself is a Polling Consumer for a channel with a queue. + + + + + + 'id' value: + - Identifies the underlying Spring bean definition (AbstractEndpoint) + - as MessageHandler bean alias together with suffix '.handler' + + + + + + + + + + + + + + + + + or poller + sub element. + Used to take action after the transaction completes () or after + the channel.send() is complete (). + ]]> + + + + ), + or after the transaction commits (). The #root variable of the + expression evaluation is the original message; a BeanResolver is also available. + ]]> + + + + + + + + + + + + + + + ), + or after the transaction rolls back (). The #root variable of the + expression evaluation is the original message; a BeanResolver is also available. + ]]> + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.2.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.2.xsd deleted file mode 100644 index 1658e38d8d..0000000000 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.2.xsd +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - Configures an inbound Channel Adapter which listens for Application Context - events, converts them to Messages and sends them to a Message Channel. - - - - - - - - - - - - - The channel to which Messages generated from Application Context events will be sent. - - - - - - - - - - - - If a (synchronous) downstream exception is thrown and an error-channel is specified, - the MessagingException will be sent to this channel. Otherwise, any such exception - will be propagated to the caller. - - - - - - - Comma delimited list of event types (classes that extend ApplicationEvent) that this adapter - should send to the message channel. By default, all event types will be sent [OPTIONAL] - - - - - - - - - - - - - - - - Defines a Channel Adapter that receives Messages from a MessageChannel and then publishes - MessagingEvents containing those Messages. - - - - - - - - - - - - - - - - The Message Channel from which this adapter receives Messages. - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd index 27a0005d24..1658e38d8d 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> - + - + + diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd deleted file mode 100644 index b9bda235d5..0000000000 --- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - The URL for an RSS or ATOM feed. - - - - - - - - - - - - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where - messages will be sent to by this adapter (e.g., inbound-channel-adapter). - - - - - - - Reference to a FeedFetcher instance for retrieveing Feeds from the provided URL. - By default, the HTTP protocol is supported. For any other protocols or general - customizations, provide a reference to a different implementation. - - - - - - - - - - - - Reference to a MetadataStore instance for storing metadata associated with - the retrieved feeds. If the implementation is persistent, it can help to - prevent duplicates between restarts. If shared, it can help coordinate multiple - instances of an adapter across different processes. - - - - - - - - - - - - Lifecycle attribute signaling if this component should be started during Application Context startup. - Default is 'true' - - - - - - - \ No newline at end of file diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd index 9831c0df12..b9bda235d5 100644 --- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd +++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.2.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.2.xsd deleted file mode 100644 index 524a4ded55..0000000000 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.2.xsd +++ /dev/null @@ -1,565 +0,0 @@ - - - - - - - - - - - - - - Configures an inbound Channel Adapter that polls a directory and sends Messages whose payloads are - instances of java.io.File. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element. Therefore, if the "channel" attribute - is not provided, then the "id" attribute is required. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lifecycle attribute signaling if this component should be started during Application Context startup. - - - - - - - Specify whether to automatically create the source directory if it does not yet exist when this - adapter is being initialized. The default value is 'true'. If set to 'false' and the directory - does not exist upon initialization, an Exception will be thrown. - - - - - - - Specify the maximum number of files stored in memory by the underlying FileReadingMessageSource. - This is useful to limit the memory footprint of this endpoint. Using a stateful filter would counter - this benefit, so AcceptOnceFileListFilter is not used when this attribute is specified. - MUTUALLY EXCLUSIVE with comparator, if comparator is set this attribute will be ignored. - MUTUALLY EXCLUSIVE with stateful filtering. - - - - - - - - - - Configures an outbound Channel Adapter that writes Message payloads to a File. - - - - - - - - The channel through which outgoing messages will arrive. - - - - - - - - - - - - - - - - Configures an outbound Gateway that writes request Message payloads to a File and then generates a - reply Message containing the newly written File as its payload. - - - - - - - - The channel through which outgoing messages will arrive. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Allows you to provide a SpEL expression which will compute the file name of - the target file (e.g., assuming payload is java.io.File "payload.name + '.transferred'"); - - - - - - - Extension used when uploading files. We change it after we know it's uploaded. - This attribute is mutualy exclusive with 'append' since the append is done to the - actual file and not its temporary counterpart. The default value of this attribute (i.e., .writing) - is ignored when 'append' is set to true. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a Transformer that converts a File payload to a String. - - - - - - - - - - - - - - - - - - - - - Creates a Transformer that converts a File payload to an array of bytes. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd index e30017812c..524a4ded55 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> element. Therefore, if the "channel" attribute is not provided, then the "id" attribute is required. ]]> @@ -74,7 +74,7 @@ - + @@ -87,11 +87,11 @@ + ]]> @@ -144,7 +144,7 @@ Only files matching this regular expression will be picked up by this adapter. Lifecycle attribute signaling if this component should be started during Application Context startup. - + @@ -174,7 +174,7 @@ Only files matching this regular expression will be picked up by this adapter. Configures an outbound Channel Adapter that writes Message payloads to a File. - + @@ -199,11 +199,11 @@ Only files matching this regular expression will be picked up by this adapter. Configures an outbound Gateway that writes request Message payloads to a File and then generates a reply Message containing the newly written File as its payload. - + - + The channel through which outgoing messages will arrive. @@ -216,7 +216,7 @@ Only files matching this regular expression will be picked up by this adapter. - @@ -226,33 +226,71 @@ Only files matching this regular expression will be picked up by this adapter. + + + + + - + - + + - - - - - + + + + + + + + + + + + + - - + @@ -263,7 +301,7 @@ Only files matching this regular expression will be picked up by this adapter. - Allows you to provide a SpEL expression which will compute the file name of + Allows you to provide a SpEL expression which will compute the file name of the target file (e.g., assuming payload is java.io.File "payload.name + '.transferred'"); @@ -272,9 +310,54 @@ Only files matching this regular expression will be picked up by this adapter. Extension used when uploading files. We change it after we know it's uploaded. + This attribute is mutualy exclusive with 'append' since the append is done to the + actual file and not its temporary counterpart. The default value of this attribute (i.e., .writing) + is ignored when 'append' is set to true. + + + + + + + + - - + + - - - + + @@ -332,11 +415,11 @@ Only files matching this regular expression will be picked up by this adapter. - - + @@ -348,7 +431,7 @@ Only files matching this regular expression will be picked up by this adapter. Creates a Transformer that converts a File payload to an array of bytes. - + @@ -366,7 +449,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -377,10 +460,10 @@ Only files matching this regular expression will be picked up by this adapter. - - + @@ -391,27 +474,27 @@ Only files matching this regular expression will be picked up by this adapter. - - + - + - - + - + @@ -425,11 +508,58 @@ Only files matching this regular expression will be picked up by this adapter. - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd deleted file mode 100644 index 5ac4c3e054..0000000000 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd +++ /dev/null @@ -1,511 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Allows you to provide a SpEL expression which - will compute the directory - path where the files will be transferred to - (e.g., "headers.['remote_dir'] + - '/myTransfers'"); - - - - - - - Allows you to provide a SpEL expression which - will compute the temporary directory - path where files will be transferred to before they are moved to the remote-directory - (e.g., "headers.['remote_dir'] + - '/temp/myTransfers'"); - - - - - - - Specify whether to automatically create the - remote target directory if - it doesn't exist. - - - - - - - Allows you to specify a reference to - [org.springframework.integration.file.FileNameGenerator] bean. - - - - - - - - - - - - Allows you to provide SpEL expression which - will compute file name of - the remote file (e.g., assuming payload - is java.io.File - "payload.getName() + '.transfered'"); - - - - - - - Allows you to suppress using a temporary file name while writing the file. - - - - - - - Specifies the order for invocation when this - endpoint is connected as a - subscriber to a channel. This is - particularly relevant when that channel - is using a "failover" - dispatching strategy, or when a failure in - the delivery to one - subscriber should signal that - the message should not be sent to - subscribers with a higher 'order' - attribute. It has no effect - when this - endpoint itself is a Polling Consumer for a channel - with a queue. - - - - - - - - - - - - - - - - - - - - - - Allows you to provide a file name pattern to - determine the file names - that need to be scanned. - This is based on - simple pattern matching (e.g., "*.txt, fo*.txt" - etc.) - - - - - - - Allows you to provide a SpEL expression to - generate the file name of - the local (transferred) file. The root - object of the SpEL - evaluation is the name of the original - file. - For example, a valid expression would be "#this.toUpperCase() + - '.a'" where #this represents the - original name of the remote - file. - - - - - - - Allows you to provide a Regular Expression to - determine the file names - that need to be scanned. - (e.g., - "f[o]+\.txt" etc.) - - - - - - - - - - - - - - - - - Allows you to specify a reference to a - [org.springframework.integration.file.filters.FileListFilter] - bean. - - - - - - - Identifies the directory path (e.g., - "/local/mytransfers") where files - will be transferred TO. - - - - - - - Tells this adapter if the local directory must - be auto-created if it - doesn't exist. Default is TRUE. - - - - - - - Specify whether to delete the remote source - file after copying. - By default, the remote files will NOT be - deleted. - - - - - - - - - - - - - - - - - - - - - - FTP command - ls, get or rm - - - - - - - FTP command options; for ls, -1 means just - return the file names - (otherwise file - metadata is returned, -dirs - means include directories (not included by - default), - -links means - include links (not included by default); for get, -P means - preserve - timestamp from remote file. - - - - - - - SpEL expression representing the path in the - command (e.g. ls path to - list the files in directory path). - - - - - - - - - - - - Identifies the request channel attached to - this - gateway. - - - - - - - - - - - - Identifies the reply channel attached to this - gateway. - - - - - - - - - - - - - - - - - Allows you to specify a reference to - [org.springframework.integration.file.filters.FileListFilter] - bean. - - - - - - - Allows you to provide file name pattern to - determine the file names retrieved by the ls command - and is based - on simple pattern matching algorithm (e.g., "*.txt, fo*.txt" - etc.) - - - - - - - Allows you to provide Regular Expression to - determine the file names retrieved by the ls command. - (e.g., - "f[o]+\.txt" etc.) - - - - - - - Identifies directory path (e.g., - "/local/mytransfers") where file will be - transferred TO. - - - - - - - Tells this adapter if local directory must be - auto-created if it - doesn''t exist. Default is TRUE. - - - - - - - Specifies the order for invocation when this - endpoint is connected as a - subscriber to a channel. This is - particularly relevant when that channel - is using a "failover" - dispatching strategy, or when a failure in the - delivery to one - subscriber should signal that - the message should not be sent to - subscribers with a higher 'order' - attribute. It has no effect - when - this - endpoint itself is a Polling Consumer for a channel with - a - queue. - - - - - - - - - - - - - - - Identifies the remote directory path (e.g., "/remote/mytransfers") - - - - - - - Identifies the remote temporary directory path (e.g., "/remote/temp/mytransfers") - - - - - - - - - - - - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where - messages will be sent to by this adapter (e.g., inbound-channel-adapter). - - - - - - - Allows you to specify Charset (e.g., US-ASCII, ISO-8859-1, UTF-8). [UTF-8] is default - - - - - - - - - - - - - - - - - - - - - - - Extension used when downloading files. We - change - it right after we know it's - downloaded. - - - - - - - - Allows you to provide remote file/directory - separator character. DEFAULT: - '/' - - - - - - - - - - - - Lifecycle attribute signaling if this component - should be started during - Application Context startup. - Default is - 'true' - - - - - - - diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd index 73e4c2fe59..5ac4c3e054 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> @@ -20,6 +20,9 @@ + + + @@ -115,7 +118,7 @@ @@ -232,6 +235,9 @@ + + + @@ -264,8 +270,7 @@ - + @@ -294,6 +299,29 @@ + + + + + @@ -403,8 +431,8 @@ - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where + Identifies channel attached to this adapter. Depending on the type of the adapter + this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where messages will be sent to by this adapter (e.g., inbound-channel-adapter). @@ -419,7 +447,7 @@ - + - + diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd deleted file mode 100644 index db4fb05c4e..0000000000 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - Configures an inbound Channel Adapter backed by a - GemFire CacheListener - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Configures an inbound Channel Adapter backed by a - Spring Gemfire QueryListener - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Configures an outbound Channel Adapter that - writes Message to a Gemfire cache - - - - - - - A map of SpEL expressions used to create cache entries. If not - provided, payload must be a Map - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd index 856e629b99..db4fb05c4e 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd @@ -10,7 +10,7 @@ schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> - + @@ -142,7 +142,8 @@ - + + diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd deleted file mode 100644 index dc60b9a20e..0000000000 --- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - Configures an inner bean that will generate a - Groovy Script. - - - - - - - - - - - Reference to a GroovyObjectCustomizer bean to be applied to this script. - - - - - - - - - - - - - - - - - - - - - - - - - Reference to a GroovyObjectCustomizer bean to be - applied to each script payload. - - - - - - - - - - diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd index d397972165..dc60b9a20e 100644 --- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd +++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd @@ -7,10 +7,10 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - + @@ -49,11 +49,12 @@ ]]> - + - - + + + diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd deleted file mode 100644 index bb6190f11a..0000000000 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd +++ /dev/null @@ -1,800 +0,0 @@ - - - - - - - - - - - - - - - - Defines an inbound HTTP-based Channel Adapter. - - - - - - - - - - [DEPRECATED since v2.1] Use the 'path' attribute if you want - to specify the path or the 'id' attribute if you simply want - to identify this component. - - When using the 'path' attribute, please ensure to also - declare a handler mapping bean of type - 'org.springframework.integration.http.inbound.UriPathHandlerMapping'. - - This bean is used by the Spring MVC DispatcherServlet - to evaluate which URL maps to which inbound endpoint. - For more information please see the chapter on - 'Handler mappings' in the Spring Framework Reference - Documentation. - - - - - - - - - - - - - - - - Target type for payload that is the conversion result of the request. - - - - - - - - - View name to be resolved when rendering a response. - This attribute is not allowed if there is a 'view-expression' attribute. - - - - - - - SpEL expression that resolves to a view to be resolved when rendering a response. - The expression can resolve to a view name or View object. - However, because there is no reply message, the - 'evaluationContext' for this expression is rather lightweight; it has a - 'BeanResolver' but no variables, - so the usage of this attribute is somewhat limited. - An example might be to resolve, at runtime, some scoped Bean that returns a - view name or View object. - This attribute is not allowed if there is a 'view-name' attribute. - - - - - - - In the case that a view-name is specified this attribute can be used to - override the default key of the Errors (if the request cannot be handled). - Defaults to "errors" (similar to normal MVC - usage). - - - - - - - Allows you to specify SpEL expression to construct a Message payload - - - - - - - Allows you to specify the URI path (e.g., /orderId/{order}) - - When using the 'path' attribute, please ensure to also - declare a handler mapping bean of type - 'org.springframework.integration.http.inbound.UriPathHandlerMapping'. - - This bean is used by the Spring MVC DispatcherServlet to - evaluate which URL maps to which inbound endpoint. For - more information please see the chapter on 'Handler mappings' - in the Spring Framework Reference Documentation. - - - - - - - In the case that a view-name is specified this attribute can be used to - override the default error code under which the handling exception is exposed. - Defaults to - "spring.integration.http.handler.error" and is supplied with 3 - parameters: the exception itself, its message and - its stack trace as a String. - - - - - - - List of HttpMessageConverters for this Channel Adapter. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an inbound HTTP-based Messaging Gateway. - - - - - - - - - - - - - - - - - - - - [DEPRECATED since v2.1] Use the 'path' attribute if you want - to specify the path or the 'id' attribute if you simply want - to identify this component. - - When using the 'path' attribute, please ensure to also - declare a handler mapping bean of type - 'org.springframework.integration.http.inbound.UriPathHandlerMapping'. - - This bean is used by the Spring MVC DispatcherServlet - to evaluate which URL maps to which inbound endpoint. - For more information please see the chapter on - 'Handler mappings' in the Spring Framework Reference - Documentation. - - - - - - - - - View name to be resolved when rendering a response. - This attribute is not allowed if there is a 'view-expression' attribute. - - - - - - - SpEL expression that resolves to a view to be resolved when rendering a response. - The expression can resolve to a view name or View object. - The root object of the evaluation context is the reply message. - This attribute is not allowed if there is a 'view-name' attribute. - - - - - - - In the case that a view-name is specified this attribute can be used to - override the default key of the Errors (if the request cannot be handled). - Defaults to "errors" (similar to normal MVC usage). - - - - - - - Allows you to specify SpEL expression to construct a Message payload - - - - - - - Allows you to specify the URI path (e.g., /orderId/{order}) - - When using the 'path' attribute, please ensure to also - declare a handler mapping bean of type - 'org.springframework.integration.http.inbound.UriPathHandlerMapping'. - - This bean is used by the Spring MVC DispatcherServlet - to evaluate which URL maps to which inbound endpoint. - For more information please see the chapter on - 'Handler mappings' in the Spring Framework Reference - Documentation. - - - - - - - In the case that a view-name is specified this attribute can be used to - override the default error code under which the handling exception is exposed. - Defaults to "spring.integration.http.handler.error" and is supplied with 3 - parameters: the exception itself, its message and its stack trace as a String. - - - - - - - In the case that a view-name is not specified this attribute can be used to - override the default behaviour when there is a message handling exception (which - is to rethrow). If this flag is true then the normal conversion process will be - applied to the exception and written out to the response body. - - - - - - - Target type for payload that is the conversion result of the request. - - - - - - - List of HttpMessageConverters for this Gateway. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an outbound HTTP-based Channel Adapter. - - - - - - - - - - - - - - - - - - - - - - - The HTTP method to use when executing requests with this adapter Default is POST. - This attribute cannot be provided if http-method-expression has a value. - - - - - - - - - - The SpEL expression to determine HTTP method, use when executing requests with this adapter, - dynamically. This attribute cannot be provided if http-method has a value. - - - - - - - - - - - - - - - - - - - - - - - - - - - The expected type to which the response body should be converted. - Default is 'org.springframework.http.ResponseEntity'. - This attribute cannot be provided if expected-response-type-expression has a value - - - - - - - - - - - - SpEL expression to determine the type for the expected response to which the response body should be converted - The returned value of the expression could be an instance of java.lang.Class or - java.lang.String representing a fully qualified class name. - This attribute cannot be provided if expected-response-type has a value - - - - - - - Provide a reference to a list of HttpMessageConverter instances. If specified, these converters will replace - all of the default converters that would normally be present on the underlying RestTemplate. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifies whether this adapter should start automatically. - - - - - - - - - - - Defines an outbound HTTP-based Messaging Gateway. - - - - - - - - - - - - - - - - - - - - - URL to which the requests should be sent. It may include {placeholders} for - evaluation against uri-variables. - - - - - - - - - - - - - The HTTP method to use when executing requests with this adapter. Default is POST. - This attribute cannot be provided if http-method-expression has a value. - - - - - - - - - - The SpEL expression to determine HTTP method, use when executing requests with this gateway, - dynamically. This attribute cannot be provided if http-method has a value. - - - - - - - Provide a reference to a list of HttpMessageConverter instances. If specified, these converters will replace - all of the default converters that would normally be present on the underlying RestTemplate. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The expected type to which the response body should be converted. - Default is 'org.springframework.http.ResponseEntity'. - This attribute cannot be provided if expected-response-type-expression has a value - - - - - - - - - - - - SpEL expression to determine the type for the expected response to which the response body should be converted - The returned value of the expression could be an instance of java.lang.Class or - java.lang.String representing a fully qualified class name. - This attribute cannot be provided if expected-response-type has a value - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines common configuration for gateway adapters. - - - - - - - - - - - - - - - diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd index 6441ff2289..bb6190f11a 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd @@ -1,11 +1,13 @@ + View name to be resolved when rendering a response. + This attribute is not allowed if there is a 'view-expression' attribute. + + + + + + + SpEL expression that resolves to a view to be resolved when rendering a response. + The expression can resolve to a view name or View object. + However, because there is no reply message, the + 'evaluationContext' for this expression is rather lightweight; it has a + 'BeanResolver' but no variables, + so the usage of this attribute is somewhat limited. + An example might be to resolve, at runtime, some scoped Bean that returns a + view name or View object. + This attribute is not allowed if there is a 'view-name' attribute. @@ -163,6 +181,15 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re + + + + + + + + + @@ -188,6 +215,17 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re View name to be resolved when rendering a response. + This attribute is not allowed if there is a 'view-expression' attribute. + + + + + + + SpEL expression that resolves to a view to be resolved when rendering a response. + The expression can resolve to a view name or View object. + The root object of the evaluation context is the reply message. + This attribute is not allowed if there is a 'view-name' attribute. @@ -329,28 +367,48 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re Defines an outbound HTTP-based Channel Adapter. - + - + + - + - + - The HTTP method to use when executing requests with this adapter. + + + + + + + The HTTP method to use when executing requests with this adapter Default is POST. + This attribute cannot be provided if http-method-expression has a value. + + + + The SpEL expression to determine HTTP method, use when executing requests with this adapter, + dynamically. This attribute cannot be provided if http-method has a value. + + + @@ -375,6 +433,8 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re The expected type to which the response body should be converted. + Default is 'org.springframework.http.ResponseEntity'. + This attribute cannot be provided if expected-response-type-expression has a value @@ -383,6 +443,16 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re + + + + SpEL expression to determine the type for the expected response to which the response body should be converted + The returned value of the expression could be an instance of java.lang.Class or + java.lang.String representing a fully qualified class name. + This attribute cannot be provided if expected-response-type has a value + + + @@ -460,26 +530,55 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + - - + + + + + + + + + + + + - URL to be used as a fallback for any request Message does not contain the request URL Message header. + URL to which the requests should be sent. It may include {placeholders} for + evaluation against uri-variables. - + - The HTTP method to use when executing requests with this adapter. + + + + + + + The HTTP method to use when executing requests with this adapter. Default is POST. + This attribute cannot be provided if http-method-expression has a value. + + + + The SpEL expression to determine HTTP method, use when executing requests with this gateway, + dynamically. This attribute cannot be provided if http-method has a value. + + + @@ -531,6 +630,8 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re The expected type to which the response body should be converted. + Default is 'org.springframework.http.ResponseEntity'. + This attribute cannot be provided if expected-response-type-expression has a value @@ -539,6 +640,16 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re + + + + SpEL expression to determine the type for the expected response to which the response body should be converted + The returned value of the expression could be an instance of java.lang.Class or + java.lang.String representing a fully qualified class name. + This attribute cannot be provided if expected-response-type has a value + + + @@ -582,17 +693,25 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -667,15 +786,6 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - - - - - - - - - @@ -687,4 +797,4 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - \ No newline at end of file + diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd deleted file mode 100644 index ea9c405cd4..0000000000 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd +++ /dev/null @@ -1,699 +0,0 @@ - - - - - - - - - - - - - - - Defines a udp inbound Channel Adapter for receiving incoming udp packets. - - - - - - - - -The number of threads that will be used for socket/channel handling. Only applies -if an external task-executor is NOT being used. When using an external task executor, -its configuration specifies the number of threads. - - - - - - - - - Specifies a specific Executor to be used for socket handling. If not supplied, an internal - pooled executor will be used (See pool-size). Needed on some platforms that require the use of specific - task executors such as a WorkManagerTaskExecutor. - - - - - - - - - - - - If a (synchronous) downstream exception is thrown and an "error-channel" is specified, - the MessagingException will be sent to this channel. Otherwise, any such exception - will simply be logged by the channel adapter. - - - - - - -Whether or not to do a DNS reverse-lookup on the remote ip address to insert the host name into the -message headers (ip_hostName). Default "true". - - - - - - - - - - - - Defines an outbound UDP packet-sending Channel Adapter. - - - - - - - - - - - - - - - - - - -Specifies a specific Executor to be used for handling acknowledgments in the UDP adapter. If not supplied, an internal -pooled executor will be used. Needed on some platforms that require the use of specific -task executors such as a WorkManagerTaskExecutor. - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - - - - - - - - - - - - - - - A connection factory is needed by an inbound adapter. If the connection factory has a type 'server', - the factory is 'owned' by this adapter. If it has a type 'client', it is owned by an outbound channel - adapter and this adapter will receive any incoming messages on the connection created by the outbound - adapter. - - - - - - - - - - - - - - - - - - - - - If a (synchronous) downstream exception is thrown and an "error-channel" is specified, - the MessagingException will be sent to this channel. Otherwise, any such exception - will simply be logged by the channel adapter. - - - - - - - If set to true, causes the adapter to act as a client with respect to - establishing the connection, rather than listening for incoming connections. - Requires a type="client" connection factory, with single-use set to false. - Defaults to false. - - - - - - - - - - - - - - - - - - - - - - - - - - A connection factory is needed by an outbound adapter. If the connection factory has a type 'client', - the factory is 'owned' by this adapter. If it has a type 'server', it is owned by an inbound channel - adapter and this adapter will attempt to correlate messages to the connection on which an original - inbound message was received. - - - - - - - - - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - If set to true, causes the adapter to establish a connection when started, - rather than when the first message is sent. - Requires a type="client" connection factory, with single-use set to false. - Defaults to false. - - - - - - - - - - - - - - - - - - - - - - - A connection factory is needed by an inbound adapter. The connection factory must be of type 'server'. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If a (synchronous) downstream exception is thrown and an "error-channel" is specified, - the MessagingException will be sent to this channel and the ultimate response - of the error flow will be returned as a response by the gateway. If no - "error-channel" is specified, any such exception - will simply be logged by the gateway. In such a situation, no response is sent - to the client. - - - - - - - If set to true, causes the gateway to act as a client with respect to - establishing the connection, rather than listening for incoming connections. - Requires a type="client" connection factory, with single-use set to false. - Defaults to false. - - - - - - - - - - - - - - - - - - - - - - - - - - A connection factory is needed by an outbound adapter. The connection factory must be of 'client'. - - - - - - - - - - - - - - - - - - - - - - - - - When using a shared socket, specifies the time the gateway will wait - to get access to the socket to send the request. - - - - - - - - - - - - Specifies the time the gateway will wait for a reply - from the remote system. Prior to 2.2, this was specified - with the reply-timeout attribute. To provide easier migration, - this attribute defaults to the same value of the reply-timeout, - if supplied, or 10 seconds otherwise. - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - - - - - - - -Connection factories can be 'client' or 'server'. Client factories -open a connection to a server using a host and port. Server factories -listen on a port and create a separate connection for each incoming -connection request. - - - - - - - - - - - - -The host to which a client connection factory will connect. - - - - - - -For client factories, the port to which a client connection factory will connect. -For server factories, the port on which the factory will listen for incoming -connections. - - - - - - -If true, the factory will use java.nio.channel.SocketChannel for communication; -for a large number of connections on the server side, this can provide better -performance and may use fewer threads. - - - - - - - - - - - - - -If true, instructs the factory to use direct buffers if possible; only applies if -using-nio is true. Refer to ByteBuffer javadocs for more information. - - - - - - -If true, a new connection will be created for each use. For inbound adapters -where there is no outbound adapter sharing the factory, the connection will -be closed after a message is received. For outbound adapters where there is -no inbound adapter sharing the factory, or for inbound adapters where an -outbound adapter shares the factory, the connection will be closed after -so-timeout milliseconds. For outbound adapters where an inbound adapter shares -the factory, the connection will be closed after a response is received. - - - - - - - - - - - -A Serializer that converts message payloads to/from output streams/input streams -associated with the connection. Default is ByteArrayCrLfSerializer. Serializer and Deserializer -would normally be the same but this is not required. - - - - - - - - - - - -A Deserializer that converts message payloads to/from output streams/input streams -associated with the connection. Default is ByteArrayCrLfSerializer. Serializer and Deserializer -would normally be the same but this is not required. - - - - - - -On a multi-homed system, specifies the ip address of the network interface used to communicate. -For inbound adapters and gateways, specifies the interface used to listen for incoming connections. -If omitted, the endpoint will listen on all available adapters. For the UDP multicast outbound adapter -specifies the interface to which multicast packets will be sent. For UDP unicast and multicast -adapters, specifies which interface to which the acknowledgment socket will be bound. Does not -apply to TCP outbound adapters and gateways. - - - - - - -A task executor for managing connections; if not specified a -cached thread pool task executor is used. - - - - - - -Deprecated since 2.2; previously it specified the thread pool size if -an external task executor was not provided; it was also used to set -the connection backlog for server factories. That setting is now -specified by the backlog attribute. - - - - - - -Specifies the connection backlog for server sockets. Does not -apply to client factories. - - - - - - -Whether or not to do a DNS reverse-lookup on the remote ip address to insert the host name into the -message headers (ip_connectionId, ip_hostName). Default "true". - - - - - - - - - - - - - - - -When set to "true", adds sequenceNumber and correlationId headers to messages originating from -connections created by this factory. Facilitates resequencing if necessary. Default "false". - - - - - - -A reference to a TcpSSLContextSupport strategy implementation. Providing this reference -enables SSL on connections created by this factory. A DefaultTcpSSLContextSupport implementation -is provided that takes keystore and trustore names and passwords. The SSLContext created by -this implementation is used to obtain socket factories (when using-nio="false") or SSLEngine -instances (when using-nio="true"). When this attribute is omitted, normal plain text -sockets are used. - - - - - - - - - - - -A reference to a TcpSocketSupport strategy implementation. Allows post-processing Socket -and ServerSocket instances after creation and after configured attributes are applied. - - - - - - - - - - - -A reference to a TcpSocketFactorySupport strategy implementation. Allows customization -of the factories used to create sockets. The default implementation returns default. -ServerSocketFactory and SocketFactory instances, unless an 'ssl-context-support' -attribute has been supplied, in which case the SSLContext obtained therefrom is -used to create SSLServerSocketFactory and SSLSocketFactory instances. - - - - - - - - - - - - - - - Common configuration for UDP-based adapters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - -On a multi-homed system, specifies the ip address of the network interface used to communicate. -For inbound adapters and gateways, specifies the interface used to listen for incoming connections. -If omitted, the endpoint will listen on all available adapters. For the UDP multicast outbound adapter -specifies the interface to which multicast packets will be sent. For UDP unicast and multicast -adapters, specifies which interface to which the acknowledgment socket will be bound. Does not -apply to TCP outbound adapters and gateways. - - - - - - - - - - - - - - - - - - - - - - - When in client mode, specifies the retry interval, in milliseconds, if a connection - cannot be established. Defaults to 60000. - - - - - - - When in client mode, - provide a reference to the TaskScheduler instance to - be used for establishing connections. If not provided, the default - will use a thread pool of size 1. - - - - - - - - - - diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd index 5dde3c0765..ea9c405cd4 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd @@ -11,7 +11,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> + + + @@ -162,7 +165,7 @@ task executors such as a WorkManagerTaskExecutor. If set to true, causes the adapter to act as a client with respect to establishing the connection, rather than listening for incoming connections. Requires a type="client" connection factory, with single-use set to false. - Defaults to true. + Defaults to false. @@ -176,6 +179,9 @@ task executors such as a WorkManagerTaskExecutor. + + + @@ -215,7 +221,7 @@ task executors such as a WorkManagerTaskExecutor. If set to true, causes the adapter to establish a connection when started, rather than when the first message is sent. Requires a type="client" connection factory, with single-use set to false. - Defaults to true. + Defaults to false. @@ -284,7 +290,7 @@ task executors such as a WorkManagerTaskExecutor. If set to true, causes the gateway to act as a client with respect to establishing the connection, rather than listening for incoming connections. Requires a type="client" connection factory, with single-use set to false. - Defaults to true. + Defaults to false. @@ -298,6 +304,9 @@ task executors such as a WorkManagerTaskExecutor. + + + @@ -311,7 +320,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -329,7 +338,14 @@ task executors such as a WorkManagerTaskExecutor. - + + + + When using a shared socket, specifies the time the gateway will wait + to get access to the socket to send the request. + + + + + + + Specifies the time the gateway will wait for a reply + from the remote system. Prior to 2.2, this was specified + with the reply-timeout attribute. To provide easier migration, + this attribute defaults to the same value of the reply-timeout, + if supplied, or 10 seconds otherwise. + + + @@ -478,13 +509,29 @@ apply to TCP outbound adapters and gateways. - + + + +A task executor for managing connections; if not specified a +cached thread pool task executor is used. + + + -The number of threads that will be used for socket/channel handling. Only applies -if an external task-executor is NOT being used. When using an external task executor, -its configuration specifies the number of threads. +Deprecated since 2.2; previously it specified the thread pool size if +an external task executor was not provided; it was also used to set +the connection backlog for server factories. That setting is now +specified by the backlog attribute. + + + + + + +Specifies the connection backlog for server sockets. Does not +apply to client factories. @@ -513,6 +560,52 @@ connections created by this factory. Facilitates resequencing if necessary. Defa + + + +A reference to a TcpSSLContextSupport strategy implementation. Providing this reference +enables SSL on connections created by this factory. A DefaultTcpSSLContextSupport implementation +is provided that takes keystore and trustore names and passwords. The SSLContext created by +this implementation is used to obtain socket factories (when using-nio="false") or SSLEngine +instances (when using-nio="true"). When this attribute is omitted, normal plain text +sockets are used. + + + + + + + + + + + +A reference to a TcpSocketSupport strategy implementation. Allows post-processing Socket +and ServerSocket instances after creation and after configured attributes are applied. + + + + + + + + + + + +A reference to a TcpSocketFactorySupport strategy implementation. Allows customization +of the factories used to create sockets. The default implementation returns default. +ServerSocketFactory and SocketFactory instances, unless an 'ssl-context-support' +attribute has been supplied, in which case the SSLContext obtained therefrom is +used to create SSLServerSocketFactory and SSLSocketFactory instances. + + + + + + + + diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd deleted file mode 100644 index ba12b7ef3f..0000000000 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd +++ /dev/null @@ -1,1346 +0,0 @@ - - - - - - - - - - - - - - - Defines a MessageStore (and MessageGroupStore) - backed by a database. - - - - - - - - - Reference to a data source to use to access - the database. Either this or the jdbc-operations - must be - specified (but not both). - - - - - - - - - - - - - Reference to a JdbcOperations. Either - this or - the data-source must be - specified (but not both). - - - - - - - - - - - Unique string to use as a partition for the - data in this store, so that - multiple instances can - share the same - database tables. The default - is "DEFAULT". - - - - - - - Prefix for the table names in the database - (e.g. so that a schema can be specified, or to avoid - a clash - with - other tables). The default is "INT_". - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an inbound Channel Adapter for polling a database. - - - - - - - - - - - An update query to execute when a message is - polled. If the poll is in a transaction then the - update will roll back if the transaction - does. - - - - - - - - - - - - An update query to execute when a message is - polled. If the poll is in a transaction then the - update will roll back if the transaction does. - The update can also be specified as a nested element. - - - - - - - - - Flag to indicate whether the update query - should be executed per message, or per row (in the - case that a message contains multiple rows). - - - - - - - - Limits the number of rows extracted per query (otherwise all rows - are extracted into the - outgoing message). - - - - - - - - Channel to which polled messages will be sent. - - - - - - - - - - - - Flag to indicate that the poller should start automatically on startup (default true). - - - - - - - - - Reference to a SqlParameterSourceFactory. The input is the result of the - query. The - default factory creates a parameter source that treats a List in a special - way: the parameter name is used as an expression and projected onto the list, - so for instance "update foos set status=1 where id in (:id)" will generate - an in clause from the properties "id" of the input list elements. - - - - - - - - - - - - Reference to a static SqlParameterSource for the SELECT query used for polling. If - that query has - placeholders (e.g. "SELECT * from FOO where KEY=:key") they - will be bound from this source by name. - - - - - - - - - - - - - - - - Defines an outbound Channel Adapter for updating a - database. - - - - - - - - - - - - - - Reference to a SqlParameterSourceFactory. The input is the whole - outgoing message. The - default factory creates a bean - property parameter source so the query can specify named - parameters like :payload and :headers[foo]. - - - - - - - - - - - - - Channel from which messages will be output. - When a message is sent to this channel it will - cause the query - to be executed. - - - - - - - - - - - - Flag to indicate whether primary keys are generated by the query. - - - - - - - - - Flag to indicate that the poller should start automatically on startup (default true). - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - - - - - Defines an outbound Channel Gateway for updating a - database in response to a message on the request channel, and/or - for retrieving data from the database using the input message as - a source of parameters for the specified SQL select query. - - The database response will be used to create the response Message - on the reply channel. - - The response can be created from a query - supplied here, or (if keys-generated="true") can be the - primary keys generated from an auto-increment, or else just a - count of the number of rows affected by the update. The response - is in general a case insensitive Map (or list of maps if multi-valued), unless - a select query and a row-mapper is provided. If the update count is - returned then the map key is "UPDATE". - - - - - - - - - - - An update query to be executed when a message is - received. If this is in a transaction then the - update will roll back when the transaction does. - - The update can also be specified using the - "update" attribute. - - Since Spring Integration 2.2 specifying an - update query is optional, if at least the - select query is specified. - - If you specify both, update- and select - query, then the update is executed first. - - - - - - - - - - - - - An update query to execute when a message is - received. If this is in a transaction then the - update will roll back when the transaction does. - - The update can also be specified as a nested element. - - Since Spring Integration 2.2 specifying an - update query is optional, if at least the - select query is specified. - - If you specify both, update- and select - query, then the update is executed first. - - - - - - - - When using a select query, you can set a - custom limit regarding the number of rows - extracted. Otherwise by default only the first - row will be extracted into the outgoing message. - - If set to '0' all rows are extracted. - - - - - - - - Reference to a SqlParameterSourceFactory. The input is the whole - outgoing message. The - default factory creates a bean - property parameter source so the query can specify named - parameters like :payload and :headers[foo]. - - - - - - - - - - - - Reference to a SqlParameterSourceFactory. The input is the whole - outgoing message. The - default factory creates a bean - property parameter source so the query can specify named - parameters like :payload and :headers[foo]. - - - - - - - - - - - The receiving Message Channel of this endpoint. - - - - - - - - - - - - Message Channel to which replies should be sent, - after receiving the database response. - - - - - - - - - - - - - - - - - - Flag to indicate whether primary keys are generated by the query. If they are then - they can be used as a reply payload instead of providing a select query. A single - valued result is extracted before returning (the usual case), so the payload of the reply message - can be a Map (column name to value) or a list of maps. - - - - - - - - - Flag to indicate that the poller should start automatically on startup (default true). - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - - - - - - Reference to a data source to use to access the database. - Either this or the simple-jdbc-operations must be specified - (but not both). - - - - - - - - - - - - - Reference to a JdbcOperations. Either this or the - data-source must be specified (but not both). - - - - - - - - - - - - - - - - - - A select query to execute when a message is - polled. In general the query can return multiple - rows, because the result will be a List (of - type determined by the row mapper). - - - - - - - - - - A select query to execute when a message is - polled. In general the query can return multiple - rows, because - the result will be a List (of type determined by the row - mapper). The query can also be specified as - a nested element. - - - - - - - - - - - - - - - - Reference to a row mapper to use to convert - JDBC result set rows to message payloads. Optional - with default that maps result set row to a map - (column name to column value). - Other simple use cases can be handled with - out-of-the box implementations from Spring JDBC. - Others require a custom row mapper. - - - - - - - - - - - - - - - Defines an outbound Channel Adapter for updating a - database using stored procedures. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference to a SqlParameterSourceFactory. - - - - - - - - - - - - Channel from which messages will be output. - When a message is sent to this channel it will - cause the query - to be executed. - - - - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - - - Defines an Outbound Channel Gateway for updating a database using - a stored procedure. The response of the stored procedure is used - to populate the Message for the reply channel. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference to a SqlParameterSourceFactory. The input is the whole - outgoing message. The - default factory creates a bean - property parameter source so the query can specify named - parameters like :payload and :headers[foo]. - - - - - - - - - - - If "true", a SQL Function is called. In that case - the "stored-procedure-name" attribute defines - the name of the called function. - - - - - - - - - - - - - - - - - - - - - - - - - - - - The receiving Message Channel of this endpoint. - - - - - - - - - - - - Message Channel to which replies should be sent, - after receiving the database response. - - - - - - - - - - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - Indicates the procedure's return value should be included - in the results returned. - - - - - - - - - - - - - Defines an inbound Channel Adapter for polling a - database using a stored procedure or function. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If "true", a SQL Function is called. In that case - the "stored-procedure-name" attribute defines - the name of the called function. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Channel to which polled messages will be send. If the stored - procedure or function does not return any data, the payload - of the Message will be Null. - - - - - - - - - - - - - - - - Identifies the underlying Spring bean definition, which is an - instance of either 'EventDrivenConsumer' or 'PollingConsumer', - depending on whether the component's input channel is a - 'SubscribableChannel' or 'PollableChannel'. - - - - - - - The name of the stored procedure. If the "is-function" - attribute is "true", this attributes specifies the - function name. - - - - - - - The name of the stored procedure provided as a SpEL expression. - Components that use a Message as source of parameters have - full access to the message and its headers, in order to - derive a stored procedure name. - - The expression must resolve to a String. - - - - - - - Defines the maximum number of cached SimpleJdbcCallOperations - instances. Basically, for each Stored Procedure Name a new - SimpleJdbcCallOperations instance is created that in return - is being cached. The default cache size is '10'. A value of - '0' disables caching. Negative values are not permitted. - - - - - - - - - - Reference to a data source to use to access - the database. - - - - - - - - - - - - Flag to indicate that the poller should start automatically - on startup (default true). - - - - - - - If true, the JDBC parameter definitions for the stored procedure - are not automatically derived from the underlying JDBC connection. In - that case you must specify all Sql parameter definitions explicitly - using the 'sql-parameter-definition' sub-element. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd index c44b8296a4..ba12b7ef3f 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd @@ -6,7 +6,7 @@ - + + @@ -93,7 +93,8 @@ @@ -122,8 +123,7 @@ - Defines an inbound Channel Adapter for polling a - database. + Defines an inbound Channel Adapter for polling a database. @@ -136,8 +136,8 @@ An update query to execute when a message is polled. If the poll is in a transaction then the - update will - roll back if the transaction does. + update will roll back if the transaction + does. @@ -151,8 +151,8 @@ An update query to execute when a message is polled. If the poll is in a transaction then the - update will - roll back if the transaction does. The update can also be specified as a nested element. + update will roll back if the transaction does. + The update can also be specified as a nested element. @@ -163,8 +163,7 @@ Flag to indicate whether the update query should be executed per message, or per row (in the - case that a - message contains multiple rows). + case that a message contains multiple rows). @@ -182,8 +181,7 @@ - Channel to which polled messages will be - sent. + Channel to which polled messages will be sent. @@ -247,9 +245,10 @@ - + - + + @@ -317,9 +316,14 @@ Defines an outbound Channel Gateway for updating a - database in response to a message on the request - channel and getting a response - on the reply channel. The response can be created from a query + database in response to a message on the request channel, and/or + for retrieving data from the database using the input message as + a source of parameters for the specified SQL select query. + + The database response will be used to create the response Message + on the reply channel. + + The response can be created from a query supplied here, or (if keys-generated="true") can be the primary keys generated from an auto-increment, or else just a count of the number of rows affected by the update. The response @@ -331,21 +335,31 @@ - + - An update query to execute when a message is + An update query to be executed when a message is received. If this is in a transaction then the - update will - roll back when the transaction does. + update will roll back when the transaction does. + + The update can also be specified using the + "update" attribute. + + Since Spring Integration 2.2 specifying an + update query is optional, if at least the + select query is specified. + + If you specify both, update- and select + query, then the update is executed first. - + + @@ -353,24 +367,32 @@ An update query to execute when a message is received. If this is in a transaction then the - update will - roll back when the transaction does. The update can also be specified as a nested element. + update will roll back when the transaction does. + + The update can also be specified as a nested element. + + Since Spring Integration 2.2 specifying an + update query is optional, if at least the + select query is specified. + + If you specify both, update- and select + query, then the update is executed first. - - - - When using a select query, you can set a - custom limit regarding the number of rows - extracted. Otherwise by default only the first - row will be extracted into the outgoing message. + + + + When using a select query, you can set a + custom limit regarding the number of rows + extracted. Otherwise by default only the first + row will be extracted into the outgoing message. - If set to '0' all rows are extracted. - - - + If set to '0' all rows are extracted. + + + @@ -403,11 +425,11 @@ - + - - The receiving Message Channel of this endpoint. - + + The receiving Message Channel of this endpoint. + @@ -417,10 +439,10 @@ - - Message Channel to which replies should be sent, - after receiving the database response. - + + Message Channel to which replies should be sent, + after receiving the database response. + @@ -429,18 +451,27 @@ - - - - + + + @@ -480,14 +511,10 @@ - Reference to a data source to use to access - the - database. Either this or the - simple-jdbc-operations - must be - specified + Reference to a data source to use to access the database. + Either this or the simple-jdbc-operations must be specified (but not both). - + @@ -499,11 +526,8 @@ - Reference to a JdbcOperations. Either - this or - the - data-source must be - specified (but not both). + Reference to a JdbcOperations. Either this or the + data-source must be specified (but not both). @@ -522,13 +546,10 @@ A select query to execute when a message is - polled. In general - the query can return multiple - rows, because - the result will be a List (of type determined by the - row - mapper). - + polled. In general the query can return multiple + rows, because the result will be a List (of + type determined by the row mapper). + @@ -543,7 +564,7 @@ the result will be a List (of type determined by the row mapper). The query can also be specified as a nested element. - + @@ -559,18 +580,13 @@ Reference to a row mapper to use to convert - JDBC result set rows to message payloads. - Optional - with default - that maps - result set row to a map (column name to column value). - Other simple - use cases can - be handled - with out-of-the box - implementations from Spring JDBC. Others require a custom row - mapper. - + JDBC result set rows to message payloads. Optional + with default that maps result set row to a map + (column name to column value). + Other simple use cases can be handled with + out-of-the box implementations from Spring JDBC. + Others require a custom row mapper. + @@ -590,42 +606,40 @@ - + + Fully Supported Databases (Functions) + + * MySQL + * Microsoft SQL Server + * Oracle + * PostgreSQL + ]]> @@ -633,40 +647,41 @@ type="parameterSubElementType"> - + + - - - - - - - - - - + + + + + + + + + + @@ -675,8 +690,7 @@ Reference to a SqlParameterSourceFactory. - + @@ -691,8 +705,7 @@ to be executed. - + @@ -705,17 +718,6 @@ - - - - Indicates whether this procedure's return value - should be included. - - - - - - @@ -730,52 +732,51 @@ - - - - - - + + + + + + - + @@ -783,58 +784,57 @@ maxOccurs="unbounded" type="returningResultSetRowMappersType"> - + + - - - - - - - - - - - - - - - - Reference to a SqlParameterSourceFactory. The input is the whole - outgoing message. The - default factory creates a bean - property parameter source so the query can specify named - parameters like :payload and :headers[foo]. - - - - - - - + + + + + + + + + + + + + + + + Reference to a SqlParameterSourceFactory. The input is the whole + outgoing message. The + default factory creates a bean + property parameter source so the query can specify named + parameters like :payload and :headers[foo]. + + + + + + + @@ -847,100 +847,106 @@ - - - + + - - - - - - - - - - - - - - - - + Only few developers will probably ever like to process + update counts, thus the value defaults to 'true'.]]> + + + + + + + - - The receiving Message Channel of this endpoint. - + + + + + + + + + + + The receiving Message Channel of this endpoint. + - + - - Message Channel to which replies should be sent, - after receiving the database response. - + + Message Channel to which replies should be sent, + after receiving the database response. + - + - - - - + + + @@ -953,8 +959,8 @@ - Indicates the procedure's return value should be included - in the results returned. + Indicates the procedure's return value should be included + in the results returned. @@ -973,49 +979,48 @@ - - - - - + + + + - - - + If you use a database not listed above, you + MUST provide Sql Parameter Definitions. + ]]> + + + - + @@ -1023,9 +1028,9 @@ maxOccurs="unbounded" type="returningResultSetRowMappersType"> - + @@ -1043,59 +1048,59 @@ - - - + + - - - - - - - - - + + + + + + + + + - - - - - - + Therefore, even if you set expect-single-result = true, + you may end up with a collection being returned. + ]]> + + + + + + @@ -1105,8 +1110,7 @@ - + @@ -1116,16 +1120,16 @@ - - - Identifies the underlying Spring bean definition, which is an - instance of either 'EventDrivenConsumer' or 'PollingConsumer', - depending on whether the component's input channel is a - 'SubscribableChannel' or 'PollableChannel'. - - + + + Identifies the underlying Spring bean definition, which is an + instance of either 'EventDrivenConsumer' or 'PollingConsumer', + depending on whether the component's input channel is a + 'SubscribableChannel' or 'PollableChannel'. + + - + The name of the stored procedure. If the "is-function" @@ -1134,6 +1138,32 @@ + + + + The name of the stored procedure provided as a SpEL expression. + Components that use a Message as source of parameters have + full access to the message and its headers, in order to + derive a stored procedure name. + + The expression must resolve to a String. + + + + + + + Defines the maximum number of cached SimpleJdbcCallOperations + instances. Basically, for each Stored Procedure Name a new + SimpleJdbcCallOperations instance is created that in return + is being cached. The default cache size is '10'. A value of + '0' disables caching. Negative values are not permitted. + + + + + + @@ -1170,147 +1200,147 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd deleted file mode 100644 index 5e16ef13e4..0000000000 --- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd +++ /dev/null @@ -1,1405 +0,0 @@ - - - - - - - - - - - - - - - Defines a Message Channel that is backed by a JMS Queue. - - - - - - - - - Reference to a JMS Queue. Either this attribute or the 'queue-name' - must be provided, but only one. - - - - - - - Specifies whether this channel should be Message-Driven. The value is "true" by default. - Set to "false" if this channel should be pollable. - - - - - - - Name of a JMS Queue to be resolved by this channel's DestinationResolver. - - - - - - - - - - - - Defines a Message Channel that is backed by a JMS Topic. - - - - - - - - - Reference to a JMS Topic. Either this attribute or the 'topic-name' - must be provided, but only one. - - - - - - - Name of a JMS Topic to be resolved by this channel's DestinationResolver. - - - - - - - Boolean value indicating whether the Topic subscription is durable. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID for this channel. Required. - - - - - - - Reference to a JMS ConnectionFactory. If none is provided, the default - bean name for the reference will be "connectionFactory". - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Timeout for the container's consumers if messsage-driven is TRUE, or - timeout for receive calls on the template if message-driven is FALSE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specify a boolean value indicating whether the delivery mode should be - DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - Specify the message time to live. - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - Specify the default priority of the message. Overridden by the message priority - header, if present; range 0-9. - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - - - - - - - - - Defines a JMS Message-Driven inbound Channel Adapter. - - - - - - - - - A reference to a javax.jms.Destination by bean name. As an alternative to a bean - reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the - DestinationResolver strategy (DynamicDestinationResolver by default). - - - - - - - - - - - - - The boolean property used to configure the JmsTemplate with knowledge of what JMS domain is being used. By default the value of this property is 'false'', - indicating that the point-to-point domain, Queues, will be used. This property used by JmsTemplate determines the behavior of dynamic destination resolution - via implementations of the DestinationResolver interface. - - - - - - - Boolean property indicating whether to make the subscription durable. The durable subscription name to be used can be specified - through the "durableSubscriptionName" property. Default is "false". Set this to "true" to register a durable subscription, - typically in combination with a "durableSubscriptionName" value (unless your message listener class name is good enough as - subscription name). Only makes sense when listening to a topic (pub-sub domain). - - - - - - - The name of a durable subscription to create. To be applied in case of a topic (pub-sub domain) with subscription durability - activated. The durable subscription name needs to be unique within this client's JMS client id. Default is the class name of the - specified message listener. Note: Only 1 concurrent consumer (which is the default of this message listener container) is allowed - for each durable subscription. - - - - - - - The JMS client id for a shared Connection created and used by this container. Note that client ids need to be unique among all - active Connections of the underlying JMS provider. Furthermore, a client id can only be assigned if the original ConnectionFactory - hasn't already assigned one. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If a (synchronous) downstream exception is thrown and an error-channel is specified, - the MessagingException will be sent to this channel. Otherwise, any such exception - will be propagated to the listener container and any JMS transaction will be - rolled back. Any synchronous downstream exceptions in the error flow will - also cause any JMS transaction to be rolled back. - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an inbound Channel Adapter for polling a JMS Destination. - - - - - - - - - - - - A reference to a javax.jms.Destination by bean name. As an alternative to a bean - reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the - DestinationResolver strategy (DynamicDestinationResolver by default). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Timeout for receive calls on the template. - NOTE: for JmsTemplate, 0 means indefinite while -1 means no-wait. - - - - - - - - - - - - - - - - - - - - - Defines an inbound JMS-based Messaging Gateway. - - - - - - - - - A reference to a javax.jms.Destination by bean name. As an alternative to a bean - reference, use 'request-destination-name' and 'request-pub-sub-domain' which will rely - upon the DestinationResolver strategy (DynamicDestinationResolver by default). - - - - - - - - - - - - - - A reference to a javax.jms.Destination by bean name. As an alternative to a bean - reference, use either 'default-reply-queue-name' or 'default-reply-topic-name' which - will rely upon the DestinationResolver strategy (DynamicDestinationResolver by default). - - - - - - - - - - - - - - - - - - - - - - - Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to JMS Message. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If a (synchronous) downstream exception is thrown and an "error-channel" is specified, - the MessagingException will be sent to this channel; any response from - which will be returned as a reply by the gateway. If an "error-channel" is not - supplied, any such exception - will be propagated to the listener container and any JMS transaction will be - rolled back. Any synchronous downstream exceptions in the error flow will - also cause any JMS transaction to be rolled back. - - - - - - - - - - - - - - - - Boolean property indicating whether to make the subscription durable. The durable subscription name to be used can be specified - through the "durableSubscriptionName" property. Default is "false". Set this to "true" to register a durable subscription, - typically in combination with a "durableSubscriptionName" value (unless your message listener class name is good enough as - subscription name). Only makes sense when listening to a topic (pub-sub domain). - - - - - - - The name of a durable subscription to create. To be applied in case of a topic (pub-sub domain) with subscription durability - activated. The durable subscription name needs to be unique within this client's JMS client id. Default is the class name of the - specified message listener. Note: Only 1 concurrent consumer (which is the default of this message listener container) is allowed - for each durable subscription. - - - - - - - The JMS client id for a shared Connection created and used by this container. Note that client ids need to be unique among all - active Connections of the underlying JMS provider. Furthermore, a client id can only be assigned if the original ConnectionFactory - hasn't already assigned one. - - - - - - - - - - - - - - - - - - - - Defines an outbound JMS-based Messaging Gateway. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Timeout for the JMS MessageConsumer to receive the JMS reply Message. Default is 5 seconds. - - - - - - - - - - - - A reference to a javax.jms.Destination by bean name. As an alternative to a bean - reference, use 'request-destination-name' and 'request-pub-sub-domain' which will rely - upon the DestinationResolver strategy (DynamicDestinationResolver by default). This - attribute is mutually exclusive with 'request-destination-name' and - 'request-destination-expression'. - - - - - - - - - - - - Name of a destination to which request messages will be sent. This name will be handled - by this gateway's DestinationResolver. This attribute is mutually exclusive with - 'request-destination' and 'request-destination-expression'. - - - - - - - A SpEL expression to be evaluated at runtime against each Spring Integration request Message as - the root object. The result should be either a Destination instance or a String representing - the destination name. In the latter case, it will be passed to this adapter's DestinationResolver. - This attribute is mutually exclusive with 'request-destination' and 'request-destination-name'. - - - - - - - When resolving a request destination name (rather than having a 'request-destination' reference), - a true value here specifies that the DestinationResolver should resolve Topics rather than Queues. - Default is false. - - - - - - - A reference to a javax.jms.Destination by bean name. As an alternative to a bean - reference, use 'reply-destination-name' and 'reply-pub-sub-domain' which will rely - upon the DestinationResolver strategy (DynamicDestinationResolver by default). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to JMS Message. - - - - - - - - - - - - - - - Specify a boolean value indicating whether the delivery mode should be - DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - Specify the message time to live. - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - Specify the default priority of the message. Overridden by the message priority - header, if present; range 0-9 - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - - - - - - - - - - - - - - - Defines an outbound JMS Message-sending Channel Adapter. - - - - - - - - - - - - - A reference to a javax.jms.Destination by bean name. As an alternative to a bean - reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the - DestinationResolver strategy (DynamicDestinationResolver by default). This attribute - is mutually exclusive with 'destination-name' and 'destination-expression'. - - - - - - - - - - - - Name of the destination to which JMS Messages will be sent. This will be passed to the - adapter's DestinationResolver. This attribute is mutually exclusive with 'destination' - and 'destination-expression'. - - - - - - - A SpEL expression to be evaluated at runtime against each Spring Integration Message as - the root object. The result should be either a Destination instance or a String representing - the destination name. In the latter case, it will be passed to this adapter's DestinationResolver. - If the evaluation result is null, messages will be sent to the default destination of the - underlying JmsTemplate. This attribute is mutually exclusive with 'destination' and 'destination-name'. - - - - - - - If true, specifies that destination names should resolve to Topics rather than Queues. Default is false. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specify a boolean value indicating whether the delivery mode should be - DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - Specify the message time to live. - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - Specify the default priority of the message. Overridden by the message priority - header, if present; range 0-9. - This setting will only take effect if 'explicit-qos-enabled' is true. - - - - - - - - - - - - - - - - - - - - - - Common configuration for message-driven inbound JMS-based adapters. - - - - - - - - - - - - - - - - - - - - - Common configuration for inbound JMS-based adapters. - - - - - - - - - - - - - - - - - - - - - A JMS Message Selector expression. - - - - - - - - - - - - Defines a Transformer for adding statically configured JMS Headers. - - - - - - - - - The ReplyTo Destination for the JMS Message. - - - - - - - The Correlation ID for the JMS Message. - - - - - - - - Specify the default boolean value for whether to overwrite existing header values. This will only take effect for - sub-elements that do not provide their own 'overwrite' attribute. If the 'default-overwrite' attribute is not - provided, then the specified header values will NOT overwrite any existing ones with the same header names. - - - - - - - - - - - - - - - - - - - - - - - - - - Boolean value to indicate whether this header value should overwrite an existing header value for the same name. - - - - - - - - - - - - Common configuration for JMS-based adapters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specify the number of concurrent consumers to create. Default is 1. - Specifying a higher value for this setting will increase the standard - level of scheduled concurrent consumers at runtime: This is effectively - the minimum number of concurrent consumers which will be scheduled - at any given time. This is a static setting; for dynamic scaling, - consider specifying the "maxConcurrentConsumers" setting instead. - Raising the number of concurrent consumers is recommendable in order - to scale the consumption of messages coming in from a queue. However, - note that any ordering guarantees are lost once multiple consumers are - registered - - - - - - - Specify the maximum number of concurrent consumers to create. Default is 1. - If this setting is higher than "concurrentConsumers", the listener container - will dynamically schedule new consumers at runtime, provided that enough - incoming messages are encountered. Once the load goes down again, the number of - consumers will be reduced to the standard level ("concurrentConsumers") again. - Raising the number of concurrent consumers is recommendable in order - to scale the consumption of messages coming in from a queue. However, - note that any ordering guarantees are lost once multiple consumers are - registered. - - - - - - - Specify the level of caching that this listener container is allowed to apply: - CACHE_NONE = 0 - CACHE_CONNECTION = 1 - CACHE_SESSION = 2 - CACHE_CONSUMER = 3 - - - - - - - Specify the maximum number of messages to process in one task. - More concretely, this limits the number of message reception attempts - per task, which includes receive iterations that did not actually - pick up a message until they hit their timeout - - - - - - - - Interval in miliseconds between the recovery attempts - - - - - - - Specify the limit for the number of consumers that are allowed to be idle at any given time. - This limit is used to determine if a new invoker should be created. Increasing the limit causes - invokers to be created more aggressively. This can be useful to ramp up the - number of invokers faster. - The default is 1, only scheduling a new invoker (which is likely to - be idle initially) if none of the existing invokers is currently idle. - - - - - - - Specify the limit for idle executions of a consumer task, not having - received any message within its execution. If this limit is reached, - the task will shut down and leave receiving to other executing tasks. - The default is 1, closing idle resources early once a task didn't - receive a message. - - - - - - - \ No newline at end of file diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd index ac88b1c7f6..5e16ef13e4 100644 --- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd +++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd @@ -11,7 +11,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> - + @@ -342,6 +342,41 @@ ]]> + + + + Specify a boolean value indicating whether the delivery mode should be + DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). + This setting will only take effect if 'explicit-qos-enabled' is true. + + + + + + + Specify the message time to live. + This setting will only take effect if 'explicit-qos-enabled' is true. + + + + + + + Specify the default priority of the message. Overridden by the message priority + header, if present; range 0-9. + This setting will only take effect if 'explicit-qos-enabled' is true. + + + + + + + + + @@ -358,7 +393,7 @@ A reference to a javax.jms.Destination by bean name. As an alternative to a bean reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the - DestinationResolver strategy (DynamicDestinationResolver by default). + DestinationResolver strategy (DynamicDestinationResolver by default). @@ -371,9 +406,9 @@ - The boolean property used to configure the JmsTemplate with knowledge of what JMS domain is being used. By default the value of this property is 'false'', - indicating that the point-to-point domain, Queues, will be used. This property used by JmsTemplate determines the behavior of dynamic destination resolution - via implementations of the DestinationResolver interface. + The boolean property used to configure the JmsTemplate with knowledge of what JMS domain is being used. By default the value of this property is 'false'', + indicating that the point-to-point domain, Queues, will be used. This property used by JmsTemplate determines the behavior of dynamic destination resolution + via implementations of the DestinationResolver interface. @@ -383,17 +418,17 @@ Boolean property indicating whether to make the subscription durable. The durable subscription name to be used can be specified through the "durableSubscriptionName" property. Default is "false". Set this to "true" to register a durable subscription, typically in combination with a "durableSubscriptionName" value (unless your message listener class name is good enough as - subscription name). Only makes sense when listening to a topic (pub-sub domain). + subscription name). Only makes sense when listening to a topic (pub-sub domain). - + The name of a durable subscription to create. To be applied in case of a topic (pub-sub domain) with subscription durability activated. The durable subscription name needs to be unique within this client's JMS client id. Default is the class name of the specified message listener. Note: Only 1 concurrent consumer (which is the default of this message listener container) is allowed - for each durable subscription. + for each durable subscription. @@ -405,7 +440,7 @@ hasn't already assigned one. - + @@ -451,11 +486,11 @@ - + - + - + @@ -478,7 +513,7 @@ A reference to a javax.jms.Destination by bean name. As an alternative to a bean reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the - DestinationResolver strategy (DynamicDestinationResolver by default). + DestinationResolver strategy (DynamicDestinationResolver by default). @@ -544,7 +579,7 @@ A reference to a javax.jms.Destination by bean name. As an alternative to a bean reference, use 'request-destination-name' and 'request-pub-sub-domain' which will rely - upon the DestinationResolver strategy (DynamicDestinationResolver by default). + upon the DestinationResolver strategy (DynamicDestinationResolver by default). @@ -560,7 +595,7 @@ A reference to a javax.jms.Destination by bean name. As an alternative to a bean reference, use either 'default-reply-queue-name' or 'default-reply-topic-name' which - will rely upon the DestinationResolver strategy (DynamicDestinationResolver by default). + will rely upon the DestinationResolver strategy (DynamicDestinationResolver by default). @@ -579,7 +614,7 @@ JMSMessageID from the request will be copied into the JMSCorrelationID of the reply unless there is already a value in the JMSCorrelationID property of the newly created reply Message in which case nothing will be copied. If the JMSCorrelationID of the - request Message should be copied into the JMSCorrelationID of the reply Message + request Message should be copied into the JMSCorrelationID of the reply Message instead, then this value should be set to "JMSCorrelationID". Any other value will be treated as a JMS String Property to be copied as-is from the request Message into the reply Message with the same property name. @@ -593,7 +628,7 @@ - Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to JMS Message. + Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to JMS Message. @@ -630,7 +665,7 @@ If a (synchronous) downstream exception is thrown and an "error-channel" is specified, the MessagingException will be sent to this channel; any response from - which will be returned as a reply by the gateway. If an "error-channel" is not + which will be returned as a reply by the gateway. If an "error-channel" is not supplied, any such exception will be propagated to the listener container and any JMS transaction will be rolled back. Any synchronous downstream exceptions in the error flow will @@ -653,17 +688,17 @@ Boolean property indicating whether to make the subscription durable. The durable subscription name to be used can be specified through the "durableSubscriptionName" property. Default is "false". Set this to "true" to register a durable subscription, typically in combination with a "durableSubscriptionName" value (unless your message listener class name is good enough as - subscription name). Only makes sense when listening to a topic (pub-sub domain). + subscription name). Only makes sense when listening to a topic (pub-sub domain). - + The name of a durable subscription to create. To be applied in case of a topic (pub-sub domain) with subscription durability activated. The durable subscription name needs to be unique within this client's JMS client id. Default is the class name of the specified message listener. Note: Only 1 concurrent consumer (which is the default of this message listener container) is allowed - for each durable subscription. + for each durable subscription. @@ -677,9 +712,9 @@ - + - + @@ -696,9 +731,52 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -721,15 +799,31 @@ - Timeout for the JMS MessageConsumer to receive the JMS reply Message. Default is 5 seconds. + Timeout for the JMS MessageConsumer to receive the JMS reply Message. Default is 5 seconds. - - Timeout for sending the mapped integration Message to this gateway's reply-channel. Default is indefinite. - + @@ -766,13 +860,13 @@ This attribute is mutually exclusive with 'request-destination' and 'request-destination-name'. - + When resolving a request destination name (rather than having a 'request-destination' reference), a true value here specifies that the DestinationResolver should resolve Topics rather than Queues. - Default is false. + Default is false. @@ -781,7 +875,7 @@ A reference to a javax.jms.Destination by bean name. As an alternative to a bean reference, use 'reply-destination-name' and 'reply-pub-sub-domain' which will rely - upon the DestinationResolver strategy (DynamicDestinationResolver by default). + upon the DestinationResolver strategy (DynamicDestinationResolver by default). @@ -845,7 +939,7 @@ - Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to JMS Message. + Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to JMS Message. @@ -870,9 +964,31 @@ - - - + + + + Specify the message time to live. + This setting will only take effect if 'explicit-qos-enabled' is true. + + + + + + + Specify the default priority of the message. Overridden by the message priority + header, if present; range 0-9 + This setting will only take effect if 'explicit-qos-enabled' is true. + + + + + + + + @@ -894,9 +1010,10 @@ - + - + + @@ -976,9 +1093,31 @@ - - - + + + + Specify the message time to live. + This setting will only take effect if 'explicit-qos-enabled' is true. + + + + + + + Specify the default priority of the message. Overridden by the message priority + header, if present; range 0-9. + This setting will only take effect if 'explicit-qos-enabled' is true. + + + + + + + + Specify the default boolean value for whether to overwrite existing header values. This will only take effect for sub-elements that do not provide their own 'overwrite' attribute. If the 'default-overwrite' attribute is not - provided, then the specified header values will NOT overwrite any existing ones with the same header names. + provided, then the specified header values will NOT overwrite any existing ones with the same header names. - + @@ -1175,7 +1314,7 @@ - + @@ -1225,11 +1364,11 @@ Specify the maximum number of messages to process in one task. More concretely, this limits the number of message reception attempts per task, which includes receive iterations that did not actually - pick up a message until they hit their timeout + pick up a message until they hit their timeout - + @@ -1256,11 +1395,11 @@ received any message within its execution. If this limit is reached, the task will shut down and leave receiving to other executing tasks. The default is 1, closing idle resources early once a task didn't - receive a message. + receive a message. - + \ No newline at end of file diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.2.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.2.xsd deleted file mode 100644 index 242d40e084..0000000000 --- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.2.xsd +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - Defines an inbound Channel Adapter that polls for JMX attribute values. - - - - - - - - - - - - - - - - - - Defines an outbound Gateway which allows for Message-driven invocation of managed operations that - return values - - - - - - - - - - - - - - - - - - - Defines an outbound Channel Adapter for invoking JMX operations. - - - - - - - - - - - - - - - - - of ObjectNames or ObjectName patterns. - ]]> - - - - - - - - - - - - - - - - Defines an outbound Channel Adapter that publishes JMX notifications. - - - - - - - - - - - - - - - - - - Exports Message Channels and Endpoints as MBeans. - - - - - - - - - The domain name for the MBeans exported by this Exporter. - - - - - - - - - - - - Static object properties to be used for this domain. These properties are appended to - the ObjectName of all MBeans registered by this component. - - - - - - - Comma separated list of simple patterns for component names to register (defaults to '*'). - The pattern is applied to all components before they are registered, looking for a match on - the 'name' property of the ObjectName. A MessageChannel and a MessageHandler (for instance) - can share a name because they have a different type, so in that case they would either both - be included or both excluded. - - - - - - - - - - - - An Executor used when shutting down the application using the 'stopActiveComponents()' - method. Only required when invoking the operation on a Spring-managed thread, such as - via a from, say, an error flow. Using this executor avoids the - problem where the shutdown will wait for the current thread to terminate, time out, - and then force-close other components. When a dedicated executor is supplied, - the method will not wait on its threads to complete, and will terminate normally. - It is recommended that the executor used here is dedicated for this purpose and - not used elsewhere. - - - - - - - - - - - - Defines inbound operation invoking type - - - - - - - - - - - - - - Defines outbound operation invoking type - - - - - - - - - - - - - - - - Defines the name of the MBeanServer bean to connect to. - - - - - - diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd index 310736d3d6..242d40e084 100644 --- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd +++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd @@ -6,7 +6,7 @@ - + - + + + + @@ -58,6 +61,9 @@ + + + @@ -66,9 +72,12 @@ - - Defines an inbound Channel Adapter that listens for JMX notifications. - + of ObjectNames or ObjectName patterns. + ]]> @@ -90,6 +99,9 @@ + + + @@ -136,6 +148,25 @@ + + + + + + + + + An Executor used when shutting down the application using the 'stopActiveComponents()' + method. Only required when invoking the operation on a Spring-managed thread, such as + via a from, say, an error flow. Using this executor avoids the + problem where the shutdown will wait for the current thread to terminate, time out, + and then force-close other components. When a dedicated executor is supplied, + the method will not wait on its threads to complete, and will terminate normally. + It is recommended that the executor used here is dedicated for this purpose and + not used elsewhere. + + + @@ -144,7 +175,7 @@ - Defines inbound operation invoking type + Defines inbound operation invoking type @@ -158,7 +189,7 @@ - Defines outbound operation invoking type + Defines outbound operation invoking type @@ -180,4 +211,4 @@ - \ No newline at end of file + diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-2.2.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd similarity index 100% rename from spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-2.2.xsd rename to spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd deleted file mode 100644 index 99e55eb465..0000000000 --- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - - - - - - - Defines an outbound mail-sending Channel Adapter. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - - - Defines an inbound Channel Adapter that polls a mailbox for mail messages. - - - - - - - - - - - - - - - - - - - - - - Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy - to use when retrieving email. Only permitted with 'imap' protocol or an 'imap' uri. - By default, the ImapMailReceiver will search for Messages based on the default SearchTerm - which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not - been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)". - - - - - - - - - - - - Defines an IMAP IDLE channel adapter. - - - - - - - - - - - - - - - - - If a (synchronous) downstream exception is thrown and an error-channel is specified, - the MessagingException will be sent to this channel. Otherwise, any such exception - will simply be logged as a warning by the channel adapter. - - - - - - - - - - - - Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy - to use when retrieving email. - By default, the ImapMailReceiver will search for Messages based on the default SearchTerm - which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not - been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)". - - - - - - - - - - - - - - - - - - - - - - - A unique identifier for this Channel Adapter. - - - - - - - Reference for the MessageChannel to which this adapter will send Messages. - - - - - - - - - - - - - - - - - - - - - - Specify the javax.mail.Session reference. - NOTE: if this is provided, then 'java-mail-properties' should not be. - - - - - - - - - - - - Reference to a 'java.util.Properties' instance with settings for the JavaMail Session. - NOTE: if this is provided, then 'session' should not be. - - - - - - - - - - - - Specify the javax.mail.Authenticator. - NOTE: if this is provided, then 'session' should not be. - - - - - - - - - - - - - - - - - - - - - - - - - - - Specify whether this endpoint should be started automatically. The default is TRUE. - - - - - - - - - - Defines a Transformer that converts a javax.mail.Message payload to a String. - - - - - - - - - - - - - - - Defines a Transformer for adding statically configured Mail Headers. - - - - - - - - - - - - - - - - - - - Specify the default boolean value for whether to overwrite existing header values. This will only take effect for - sub-elements that do not provide their own 'overwrite' attribute. If the 'default-overwrite' attribute is not - provided, then the specified header values will NOT overwrite any existing ones with the same header names. - - - - - - - - - - - - - - - - - - - Boolean value to indicate whether this header value should overwrite an existing header value for the same name. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd index 18fe4825f3..99e55eb465 100644 --- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd +++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd @@ -11,7 +11,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> - + - + + @@ -93,6 +94,23 @@ ]]> + + + + + + + + + Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy + to use when retrieving email. Only permitted with 'imap' protocol or an 'imap' uri. + By default, the ImapMailReceiver will search for Messages based on the default SearchTerm + which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not + been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)". + + + @@ -107,6 +125,9 @@ + + + @@ -122,6 +143,38 @@ + + + + + + + + + Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy + to use when retrieving email. + By default, the ImapMailReceiver will search for Messages based on the default SearchTerm + which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not + been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)". + + + + + + + + + + + + + @@ -212,14 +265,19 @@ diff --git a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-2.2.xsd b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd similarity index 100% rename from spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-2.2.xsd rename to spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd deleted file mode 100644 index c5e813a52e..0000000000 --- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd +++ /dev/null @@ -1,575 +0,0 @@ - - - - - - - - - - - - - - Defines a publish-subscribe Message Channel that is backed by a Redis topic. - - - - - - - - - Name of the Redis topic that backs this channel. - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID for this channel. Required. - - - - - - - Reference to a RedisConnectionFactory. If none is provided, the default - bean name for the reference will be "redisConnectionFactory". - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an inbound Channel Adapter for subscribing to a Redis topic. - - - - - - - The ID for this Channel Adapter. - - - - - - - Reference to a RedisConnectionFactory. If none is provided, the default - bean name for the reference will be "redisConnectionFactory". - - - - - - - - - - - - Redis topic names as a comma-delimited list of Strings. - - - - - - - Channel to which Messages will be sent. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - - - - - - - - - - - - - - Defines an outbound Redis Message-sending Channel Adapter. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - - - - - - - - - - - - - - - - Defines Redis inbound channel adapter that creates a Message which contains - a view into a redis store. THe view could be one of the subclasses of - org.springframework.data.redis.support.collections.RedisStore - - - - - - - - - Collection type supported by this adapter - - - - - - - - [DEFAULT] Redis List - - - - - - - Redis Set - - - - - - - Redis Sorted Set - - - - - - - Redis Map - - - - - - - Redis Properties - - - - - - - - - - - - - - - Defines Redis outbound channel adapter that writes the contents of the Message into - org.springframework.data.redis.support.collections.RedisStore - - - - - - - - - - RedisTemplate to be used with this adapter - - - - - - - - - - - - - - - - - Common configuration for Redis adapters. - - - - - - - - - - - - - - - - - Channel to which Messages will be sent. - - - - - - - - - - - - - - - - - - - - RedisTemplate to be used with this adapter - - - - - - - - - - - - SpEL expression that returns the name of the key for the collection being used. If you want to provide a - constant key, use the 'key' attribute. - This attribute is mutually exclusive with the 'key' attribute. - - - - - - - The name of the key for the collection being used. If you require a key to be dynamically - determined per each poll use 'key-expression' attribute. - This attribute is mutually exclusive with the 'key-expression' attribute. - - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - to serialize the 'key' value for this collection. Please refer to the JavaDoc of the RedisTemplate - for more detail. - - - - - - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - to serialize the 'value' entered into the collection. Please refer to the JavaDoc of the RedisTemplate - for more detail. - - - - - - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - to be used when serializing hash keys (only relevant for hash-typed collections). - Please refer to the JavaDoc of the RedisTemplate for more detail. - - - - - - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - to be used when serializing hash values (only relevant for hash-typed collections). - Please refer to the JavaDoc of the RedisTemplate for more detail. - - - - - - - - - - - - Channel to which Error Messages will be sent. - - - - - - - - - - - - - - - - Provide the name of the key for the collection being used. If you require a key that - is determined dynamically for each message, use the 'key-expression' attribute. - The default key is dynamically determined from the 'redis_key' header. - This attribute is mutually exclusive with the 'key-expression' attribute. - - - - - - - SpEL expression that returns the name of the key for the collection being used. If you want to provide a - constant key, use the 'key' attribute. Default is the 'redis_key' message header. - This attribute is mutually exclusive with the 'key' attribute. - - - - - - - SpEL expression that returns the name of the key for entry being stored. Only applies - if the 'collection-type' is MAP or PROPERTIES and 'extract-payload-elements' is false. - - - - - - - If set to 'true' (Default) and the payload is an instance of a "multi-value" object (i.e., Collection or Map) - it will be stored using addAll/putAll semantics. Otherwise, if set to 'false' the payload will be stored - as single entry regardless of its type. - If the payload is not an instance of a "multi-value" object, the value of this attribute is ignored and - the payload will always be stored as a single entry. - - - - - - - Collection type supported by this adapter - - - - - - - - [DEFAULT] Redis List - - - - - - - Redis Set - - - - - - - Redis Sorted Set - - - - - - - Redis Map - - - - - - - Redis Properties - - - - - - - - diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd index 27473801f1..c5e813a52e 100644 --- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd +++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> - Name of the Redis topic that backs this channel. + Name of the Redis topic that backs this channel. @@ -119,24 +119,7 @@ - - - - - - - - - - - - - - - - - - + @@ -176,7 +159,7 @@ - Channel to which Messages will be sent. + Channel to which Messages will be sent. @@ -185,18 +168,6 @@ - - - - - Channel to which Error Messages will be sent. - - - - - - - + + + + + + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + + + + + + + @@ -226,15 +219,6 @@ - - - - - - - - - + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + + + + + + + + + + + Defines Redis inbound channel adapter that creates a Message which contains + a view into a redis store. THe view could be one of the subclasses of + org.springframework.data.redis.support.collections.RedisStore + + + + + + + + + Collection type supported by this adapter + + + + + + + + [DEFAULT] Redis List + + + + + + + Redis Set + + + + + + + Redis Sorted Set + + + + + + + Redis Map + + + + + + + Redis Properties + + + + + + + + + + + + + + + Defines Redis outbound channel adapter that writes the contents of the Message into + org.springframework.data.redis.support.collections.RedisStore + + + + + + + + + + RedisTemplate to be used with this adapter + + + + + + + + + + + + + @@ -278,6 +364,212 @@ + + + + Channel to which Messages will be sent. + + + + + + + + + + + + + + + + + + RedisTemplate to be used with this adapter + + + + + + + + + + + + SpEL expression that returns the name of the key for the collection being used. If you want to provide a + constant key, use the 'key' attribute. + This attribute is mutually exclusive with the 'key' attribute. + + + + + + + The name of the key for the collection being used. If you require a key to be dynamically + determined per each poll use 'key-expression' attribute. + This attribute is mutually exclusive with the 'key-expression' attribute. + + + + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + to serialize the 'key' value for this collection. Please refer to the JavaDoc of the RedisTemplate + for more detail. + + + + + + + + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + to serialize the 'value' entered into the collection. Please refer to the JavaDoc of the RedisTemplate + for more detail. + + + + + + + + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + to be used when serializing hash keys (only relevant for hash-typed collections). + Please refer to the JavaDoc of the RedisTemplate for more detail. + + + + + + + + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + to be used when serializing hash values (only relevant for hash-typed collections). + Please refer to the JavaDoc of the RedisTemplate for more detail. + + + + + + + + + + + + Channel to which Error Messages will be sent. + + + + + + + + + + + + + + + + Provide the name of the key for the collection being used. If you require a key that + is determined dynamically for each message, use the 'key-expression' attribute. + The default key is dynamically determined from the 'redis_key' header. + This attribute is mutually exclusive with the 'key-expression' attribute. + + + + + + + SpEL expression that returns the name of the key for the collection being used. If you want to provide a + constant key, use the 'key' attribute. Default is the 'redis_key' message header. + This attribute is mutually exclusive with the 'key' attribute. + + + + + + + SpEL expression that returns the name of the key for entry being stored. Only applies + if the 'collection-type' is MAP or PROPERTIES and 'extract-payload-elements' is false. + + + + + + + If set to 'true' (Default) and the payload is an instance of a "multi-value" object (i.e., Collection or Map) + it will be stored using addAll/putAll semantics. Otherwise, if set to 'false' the payload will be stored + as single entry regardless of its type. + If the payload is not an instance of a "multi-value" object, the value of this attribute is ignored and + the payload will always be stored as a single entry. + + + + + + + Collection type supported by this adapter + + + + + + + + [DEFAULT] Redis List + + + + + + + Redis Set + + + + + + + Redis Sorted Set + + + + + + + Redis Map + + + + + + + Redis Properties + + + + + + + diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd deleted file mode 100644 index ff7d8d0135..0000000000 --- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - Defines an RMI-based inbound MessagingGateway. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an RMI-based outbound Messaging Gateway. - - - - - - - - - - - - - - - - - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - - - - - - Defines common configuration for gateway adapters. - - - - - - - - - - - - - - - - - - - diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd index 10d4bc56d7..ff7d8d0135 100644 --- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd +++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd @@ -11,7 +11,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> + + + + + + + + + @@ -54,9 +63,19 @@ - + - + + + + + + + + + + + @@ -81,15 +100,6 @@ - - - - - - - - - @@ -104,4 +114,4 @@ - \ No newline at end of file + diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd deleted file mode 100644 index fb01cd309e..0000000000 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - Configures an inner bean that will generate a - JSR 223 compliant script. - - - - - - - - - - - The script language or JSR 223 scripting engine name - - - - - - - The script variable to return as a result of the evaluation (Optional). - - - - - - - - - diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd index 9c530d2e63..fb01cd309e 100644 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd @@ -5,7 +5,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> + schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd" /> diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd deleted file mode 100644 index a90d30156a..0000000000 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - Allows you to define custom script variable bindings. The use of this - sub-element is mutually - exclusive with the 'script-variable-generator' attribute. - - - - - - Name of the script variable. - - - - - - - Value of the script variable as a literal. - - - - - - - Value of the script variable as a bean reference. - - - - - - - - - - - - - Resource location path for the Script. Either this or an inline script - as body text should be provided, but not both. - - - - - - - Reference to the ScriptVariableGenerator bean. This attribute is mutually - exclusive with any 'variable' sub-elements. - - - - - - - - - - - Refresh delay for the script contents if specified as a resource - location (defaults to -1, never refresh). - - - - - - diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd index 86326d90c2..a90d30156a 100644 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.2.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.2.xsd deleted file mode 100644 index 1fde07d437..0000000000 --- a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.2.xsd +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - Defines security requirements for one or more Message Channels. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines the security access policy for send and/or receive invocations based on a Message Channel name pattern. - - - - - - - - \ No newline at end of file diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd deleted file mode 100644 index 1170d41246..0000000000 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - Allows you to provide a SpEL expression which - will compute the directory - path - where files will be transferred to - (e.g., "headers.['remote_dir'] + - '/myTransfers'"); - - - - - - - Allows you to provide a SpEL expression which - will compute the temporary directory - path where files will be transferred to before they are moved to the remote-directory - (e.g., "headers.['remote_dir'] + - '/temp/myTransfers'"); - - - - - - - Specify whether to automatically create the - remote target directory if - it doesn't exist. - - - - - - - Allows you to specify a reference to - [org.springframework.integration.file.FileNameGenerator] bean. - - - - - - - - - - - - Allows you to provide SpEL expression which - will compute file name of - the remote file (e.g., assuming payload - is java.io.File - "payload.getName() + '.transfered'"); - - - - - - - Allows you to suppress using a temporary file name while writing the file. - - - - - - - Specifies the order for invocation when this - endpoint is connected as a - subscriber to a channel. This is - particularly relevant when that channel - is using a "failover" - dispatching strategy, or when a failure in - the delivery to one - subscriber should signal that - the message should not be sent to - subscribers with a higher 'order' - attribute. It has no effect - when this - endpoint itself is a Polling Consumer for a channel - with a queue. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Allows you to specify a reference to a - [org.springframework.integration.file.filters.FileListFilter] - bean. - - - - - - - Allows you to provide a file name pattern to - determine the file names - that need to be scanned. - This is based on - simple pattern matching (e.g., "*.txt, fo*.txt" - etc.) - - - - - - - Allows you to provide a SpEL expression to - generate the file name of - the local (transferred) file. The root - object of the SpEL - evaluation is the name of the original - file. - For example, a valid expression would be "#this.toUpperCase() + - '.a'" where #this represents the - original name of the remote - file. - - - - - - - Allows you to provide a Regular Expression to - determine the file names - that need to be scanned. - (e.g., - "f[o]+\.txt" etc.) - - - - - - - Identifies the directory path (e.g., - "/local/mytransfers") where files - will be transferred TO. - - - - - - - Tells this adapter if the local directory must - be auto-created if it - doesn't exist. Default is TRUE. - - - - - - - Specify whether to delete the remote source - file after copying. - By default, the remote files will NOT be - deleted. - - - - - - - - - - - - - - - - - - - - - - sftp command - ls, get or rm - - - - - - - sftp command options; for ls, -1 means just - return the file names - (otherwise file - metadata is returned, -dirs - means include directories (not included by - default), - -links means - include links (not included by default); for get, -P means - preserve - timestamp from remote file. - - - - - - - SpEL expression representing the path in the - command (e.g. ls path to - list the files in directory path). - - - - - - - - - - - - Identifies the request channel attached to this - gateway. - - - - - - - - - - - - Identifies the reply channel attached to this - gateway. - - - - - - - - - - - - - - - - - Allows you to specify a reference to - [org.springframework.integration.file.filters.FileListFilter] - bean. - - - - - - - Allows you to provide file name pattern to - determine the file names retrieved by the ls command - and is based - on simple pattern matching algorithm (e.g., "*.txt, fo*.txt" etc.) - - - - - - - Allows you to provide Regular Expression to - determine the file names retrieved by the ls command. - (e.g., - "f[o]+\.txt" etc.) - - - - - - - Identifies directory path (e.g., - "/local/mytransfers") where file will be - transferred TO. - - - - - - - Tells this adapter if local directory must be - auto-created if it - doesn''t exist. Default is TRUE. - - - - - - - Specifies the order for invocation when this - endpoint is connected as a - subscriber to a channel. This is - particularly relevant when that channel - is using a "failover" - dispatching strategy, or when a failure in the - delivery to one - subscriber should signal that - the message should not be sent to - subscribers with a higher 'order' - attribute. It has no effect when - this - endpoint itself is a Polling Consumer for a channel with a - queue. - - - - - - - - - - - - - - - Identifies the directory path (e.g., - "/temp/mytransfers") - - - - - - - Identifies the remote temporary directory path (e.g., "/remote/temp/mytransfers") - - - - - - - - - - - - Identifies channel attached to this adapter. - Depending on the type of the - adapter - this channel could be the - receiving channel (e.g., - outbound-channel-adapter) or channel - where - messages will be sent to by this adapter (e.g., - inbound-channel-adapter). - - - - - - - Allows you to specify Charset (e.g., US-ASCII, - ISO-8859-1, UTF-8). [UTF-8] is default - - - - - - - - - - - - - - - - - - - - - - - Extension used when downloading files. We - change - it right after we know it's - downloaded. - - - - - - - Allows you to provide remote file/directory - separator character. DEFAULT: - '/' - - - - - - - - - - - - Lifecycle attribute signaling if this component - should be started during - Application Context startup. - Default is - 'true' - - - - - - diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd index 093c328604..1170d41246 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> @@ -21,7 +21,9 @@ - + + + @@ -235,7 +237,9 @@ - + + + @@ -268,8 +272,7 @@ - + @@ -297,6 +300,29 @@ + + + + + diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd deleted file mode 100644 index 1f65e85ff0..0000000000 --- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - Configures a source that reads from stdin (System.in). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Configures an outbound Channel Adapter that writes to stdout (System.out) - or to stderr (System.err) depending on the element name. - - - - - - - - - - - - - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd index 34cefab8c4..1f65e85ff0 100644 --- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd +++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd @@ -11,7 +11,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> - - - - - - - - - - - - Configures an inbound channel adapter that consumes your friends' timeline updates - from Twitter and sends Messages whose payloads are Tweet objects. - - - - - - - - - - - - - Configures an inbound channel adapter that consumes mentions of your handle - from Twitter and sends Messages whose payloads are Tweet objects. - - - - - - - - - - - - - - Configures an inbound channel adapter that consumes search results for a given query - from Twitter and sends Messages whose payloads are Tweet objects. - - - - - - - - - Twitter search query (e.g, #springintegration). - For more info on Twitter queries please refer to this site: http://search.twitter.com/operators) - - - - - - - - - - - - Configures an inbound channel adapter that consumes direct messages from Twitter - and sends Messages whose payloads are DirectMessage objects. - - - - - - - - - - - - - - - Configures an outbound channel adapter that sends Direct Messages to a Twitter user as - specified in the header whose name is defined by the TwitterHeaders.DM_TARGET_USER_ID constant. - - - - - - - - - - - - - - Configures an outbound channel adapter that posts a status update to the authorized user's timeline. - - - - - - - - - - - - - - - - - - - - - - - - - Reference to a TwitterTemplate bean provided by the Spring Social project. - - - - - - - Lifecycle attribute signaling whether this component should be started during Application Context startup. - Default is 'true'. - - - - - - - - - - - - Message Channel to which messages will be sent by this adapter. - - - - - - - - - - - - - - - - - - - Reference to a TwitterTemplate bean provided by the Spring Social project. - - - - - - - - - - - - Message Channel where this adapter receives messages to be handled by performing Twitter operations. - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd index a26ca9e37c..1f3269d07d 100644 --- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd @@ -11,7 +11,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> - - - - - - - - - - - - - - - - Reference to the XPathExpression instance to be - evaluated against the input Message's payload. Either - this or 'xpath-expression' must be provided, but not - both. - - - - - - - - - - - - - - - - - - - - - representing channel names. Typically such a list - will contain a single channel name. However, - based on the results of an XPath Expression, the - XPath router can also take on the characteristics - of a Recipient List Router if the XPath Expression - returns more then one value. In that case, the - List will contain more then one channel - name and consequently Messages will be sent to - all channels in the list. - ]]> - - - - - - - ]]> - - - - - - - - - Specify the Converter to use when converting payloads prior to XPath evaluation. - The DefaultXmlPayloadConverter is used if this reference is not provided, and it - should be sufficient in most cases since it can convert from Node, Document, Source, - File, and String typed payloads. If you need to extend beyond the capabilities of - that default implementation, then an upstream Transformer is probably a better option - than providing a reference to a custom implementation of this strategy here. - - - - - - - - - - - - - - - - - - - - representing channel names. Typically such a list - will contain a single channel name. However, - based on the results of an XPath Expression, the - XPath router can also take on the characteristics - of a Recipient List Router if the XPath Expression - returns more then one value. In that case, the - List will contain more then one channel - name and consequently Messages will be sent to - all channels in the list. - ]]> - - - - - - - ]]> - - - - - - - - - - - - - - - - - - Defines an XPath-based Message Filter. If the XPath expression will evaluate to a boolean, - no configuration attributes are required. If the XPath expression will evaluate to a String, - a "match-value" should be provided against which the evaluation result will be matched. - There are three options for the "match-type": exact, case-insensitive, and regex. These - correspond to the equals, equals-ignore-case, and matches operations on java.lang.String, - respectively. When providing a 'match-type' value of 'regex', the value provided in - 'match-value' must be a valid Regular Expression. - - - - - - - - - - The XPath expression to evaluate. - - - - - - - - Reference to an XPath expression instance to evaluate. - - - - - - - - - - - - String value to be matched against the XPath evaluation result. If this is not provided, - then the XPath evaluation MUST produce a boolean result directly. - - - - - - - Type of match to apply between the XPath evaluation result and the 'match-value'. - Default is "exact". - - - - - - - - - - - - - - - - - - - - - - - Defines an XPath selector. - NOTE: this element is deprecated as of 2.1. Please use <xpath-filter> instead. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - representing channel names. Typically such a list - will contain a single channel name. However, based - on the result of an XPath Expression the XPath router - can also take on the characteristics of the - Recipient List Router if the XPath Expression - returns more than one value, thus resulting in - the List containing more than one channel - name. - - In that case the Message will be sent to all channels - in the list. - ]]> - - - - - - - - - - - - - - - - - Defines an XPath splitter. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an XML validating filter. - - - - - - - - - Reference to a custom 'org.springframework.xml.validation.XmlValidator' strategy - - - - - - - - - - - - - - - - - - - - - - - - - - Base type for XML filters. - - - - - - - - - - - - - - - - - - - Message Channel where you want accepted messages to be sent. - - - - - - - - - - - - Message Channel where you want rejected messages to be sent. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd index 84da9e4c80..58c6ebff3a 100644 --- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd +++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> @@ -19,12 +19,12 @@ + + + Defines an XML marshalling transformer. + + - - - Defines an XML marshalling transformer. - - @@ -76,12 +76,12 @@ + + + Defines an XML unmarshalling transformer. + + - - - Defines an XML unmarshalling transformer. - - @@ -99,21 +99,68 @@ + + + Defines an XSLT transformer. + + - - - Defines an XSLT transformer. - - - + + + + + - - + + + + + + + + + + + @@ -123,6 +170,12 @@ + @@ -132,6 +185,11 @@ + @@ -140,6 +198,18 @@ + + + @@ -149,6 +219,17 @@ + @@ -162,12 +243,12 @@ + + + Defines an XPath transformer. + + - - - Defines an XPath transformer. - - @@ -347,126 +428,167 @@ - + - - - - - - + + + + + - - - - - - - - - Reference to the XPathExpression instance to be - evaluated against the input Message's payload. Either - this or 'xpath-expression' must be provided, but not - both. - - - - - - - - - - - + This flag will allow you to manage the + evaluation type. It is 'false' by default, however if + set to 'true', then the String evaluation type will be used. + ]]> + + + + + + + + + Reference to the XPathExpression instance to be + evaluated against the input Message's payload. Either + this or 'xpath-expression' must be provided, but not + both. + + + + + + + + + + + - - - - - - - - - + + + + + + + + representing channel names. Typically such a list + will contain a single channel name. However, + based on the results of an XPath Expression, the + XPath router can also take on the characteristics + of a Recipient List Router if the XPath Expression + returns more then one value. In that case, the + List will contain more then one channel + name and consequently Messages will be sent to + all channels in the list. + ]]> + + + + + - - ]]> - - - - - - - - - Specify the Converter to use when converting payloads prior to XPath evaluation. - The DefaultXmlPayloadConverter is used if this reference is not provided, and it - should be sufficient in most cases since it can convert from Node, Document, Source, - File, and String typed payloads. If you need to extend beyond the capabilities of - that default implementation, then an upstream Transformer is probably a better option - than providing a reference to a custom implementation of this strategy here. - - + + + ]]> + + + + + + + + + Specify the Converter to use when converting payloads prior to XPath evaluation. + The DefaultXmlPayloadConverter is used if this reference is not provided, and it + should be sufficient in most cases since it can convert from Node, Document, Source, + File, and String typed payloads. If you need to extend beyond the capabilities of + that default implementation, then an upstream Transformer is probably a better option + than providing a reference to a custom implementation of this strategy here. + + - - - - - + + + + + - - - - - - - - + + + + + + + representing channel names. Typically such a list + will contain a single channel name. However, + based on the results of an XPath Expression, the + XPath router can also take on the characteristics + of a Recipient List Router if the XPath Expression + returns more then one value. In that case, the + List will contain more then one channel + name and consequently Messages will be sent to + all channels in the list. + ]]> + + + + + - - ]]> - - - - - - - + + + ]]> + + + + + + + - + + + + + @@ -537,13 +659,13 @@ + + + Defines an XPath selector. + NOTE: this element is deprecated as of 2.1. Please use <xpath-filter> instead. + + - - - Defines an XPath selector. - NOTE: this element is deprecated as of 2.1. Please use <xpath-filter> instead. - - @@ -570,25 +692,25 @@ - - + - representing channel names. Typically such a list - will contain a single channel name. However, based - on the result of an XPath Expression the XPath router - can also take on the characteristics of the - Recipient List Router if the XPath Expression - returns more than one value, thus resulting in - the List containing more than one channel - name. + Internally XPath expressions will be evaluated as + NODESET type and converted to a List + representing channel names. Typically such a list + will contain a single channel name. However, based + on the result of an XPath Expression the XPath router + can also take on the characteristics of the + Recipient List Router if the XPath Expression + returns more than one value, thus resulting in + the List containing more than one channel + name. - In that case the Message will be sent to all channels - in the list. - ]]> - + In that case the Message will be sent to all channels + in the list. + ]]> + @@ -749,4 +871,4 @@ - \ No newline at end of file + diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd deleted file mode 100644 index 483316d8d4..0000000000 --- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd +++ /dev/null @@ -1,379 +0,0 @@ - - - - - - - - - - - Configures an XMPP connection that can in turn be referenced by other components - - - - - - - - The user name (e.g., someuser@gmail.com) that will be used by this connection object - - - - - - - Lifecycle attribute signaling if this component should be started during Application Context startup. - Default is TRUE - - - - - - - The user's password - - - - - - - The host name to connect TO - - - - - - - The XMPP service name for this connection - - - - - - - The resource field specifies the XMPP resource you are using. The use of unique resources allows - you to connect to your XMPP server from multiple locations simultaneously. Resources might - - - - - - - The port on which the host is running - - - - - - - - - - - - - - - - - - - - - - Configures an endpoint that will receive chat messages sent to a given account and then forward those messages to a MessageChannel. - - - - - - - - - Specifies if generated Message payload should consist of only - the text of the XMPP message or the entire XMPP (Smack API specific) message. Default is true. - - - - - - - - - - - - Outbound Channel Adapter that sends chat messages. - - - - - - - - - - - - - Configures an endpoint that will forward Presence state changes to a MessageChannel. - - - - - - - - - - - - - Configures an endpoint that will publish an updated {@link org.jivesoftware.smack.packet.Presence} state on your {@link XMPPConnection } object. - - - - - - - - - - - - - - - - Lifecycle attribute signaling if this component should be started during Application Context startup. - - - - - - - - - - - - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where - messages will be sent to by this adapter (e.g., inbound-channel-adapter). - - - - - - - - - - - - - - - - - Reference to XMPP connection bean - - - - - - - Allows you to reference custom implementation of HeaderMapper. - - - - - - - - - - - - - - - - - - - - - - - - - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where - messages will be sent to by this adapter (e.g., inbound-channel-adapter). - - - - - - - - - - - - Reference to XMPP connection bean - - - - - - - Specifies the order for invocation when this endpoint is connected as a - subscriber to a SubscribableChannel. - - - - - - - Allows you to reference custom implementation of HeaderMapper. - - - - - - - - - - - - - - - Defines a Transformer for adding XMPP headers. - - - - - - - - - The id of the user you sending a message to (e.g., user@gmail.com) - - - - - - - The conversation thread id used to corelate XMPP packets as - belonging to a particular conversation - - - - - - - - Specify the default boolean value for whether to overwrite existing header values. This will only take effect for - sub-elements that do not provide their own 'overwrite' attribute. If the 'default-overwrite' attribute is not - provided, then the specified header values will NOT overwrite any existing ones with the same header names. - - - - - - - - - - - - - - - - Value of this header inside of a Message - - - - - - - Reference to a bean that contains a method that will compute the header value - - - - - - - SpEL expression that will compute the header value - - - - - - - Boolean value to indicate whether this header value should overwrite an existing header value for the same name. - - - - - - - - - - - - - - - - - - - The receiving Message channel of this endpoint - - - - - - - - - - - - Identifies the Message channel where Message will be sent after it's being processed by this endpoint - - - - - - diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd index 8072dc6af0..483316d8d4 100644 --- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd +++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd @@ -11,7 +11,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> @@ -214,9 +214,10 @@ - + - + +