diff --git a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas index 55c9d2f603..930d447306 100644 --- a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,3 @@ http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd 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 new file mode 100644 index 0000000000..d93534ae98 --- /dev/null +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd @@ -0,0 +1,745 @@ + + + + + + + + + + + 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" + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 '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. + + + + + + + + + + + + Reference to the MessageListener container to use for receiving AMQP Messages. If this attribute is provided, + then no other attribute related to the listener container configuration should be provided. In other words, by + setting this reference, you must take full responsibility of the listener container configuration. The only + exception is the MessageListener itself. Since that is actually the core responsibility of this Channel Adapter + implementation, the referenced listener container must NOT already have its own MessageListener configured. + + + + + + + + + + + + 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/test/java/org/springframework/integration/amqp/config/ChannelSample-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/ChannelSample-context.xml index 41101975c5..d078fbdfed 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/ChannelSample-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/ChannelSample-context.xml @@ -6,7 +6,7 @@ xmlns:console="http://www.springframework.org/schema/integration/stream" xmlns:rabbit="http://www.springframework.org/schema/rabbit" xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/PubSubChannelSample-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/PubSubChannelSample-context.xml index b6f398009a..cf731eacf0 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/PubSubChannelSample-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/PubSubChannelSample-context.xml @@ -6,7 +6,7 @@ xmlns:console="http://www.springframework.org/schema/integration/stream" xmlns:rabbit="http://www.springframework.org/schema/rabbit" xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java index ef920906de..a71ca1097c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java @@ -42,7 +42,7 @@ import org.springframework.util.StringUtils; */ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHandler { - private static final String VERSION = "2.1"; + private static final String VERSION = "2.2"; public static final String CHANNEL_INITIALIZER_BEAN_NAME = "channelInitializer"; diff --git a/spring-integration-core/src/main/resources/META-INF/spring.schemas b/spring-integration-core/src/main/resources/META-INF/spring.schemas index 0a0369d36f..bb3ce6bbb8 100644 --- a/spring-integration-core/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-core/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd http\://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd http\://www.springframework.org/schema/integration/spring-integration-2.1.xsd=org/springframework/integration/config/xml/spring-integration-2.1.xsd -http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/spring-integration-2.2.xsd=org/springframework/integration/config/xml/spring-integration-2.2.xsd +http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..f8d7763f55 --- /dev/null +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd @@ -0,0 +1,3635 @@ + + + + + + + + + + + + + + Enables annotation support for Message Endpoints. + + + + + + + Default output channel for the @Publisher annotation support. + + + + + + + + + + + + + + + + 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. + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + 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 + will use a thread pool of + size + 1. + + + + + + + + + + + + Provide a reference to the MessageStore instance that should be used + to store Messages while + awaiting the delay. + + + + + + + + + + + + Specify whether tasks should be able to complete on shutdown. By + default this is 'false'. + + + + + + + + + Defines an endpoint that passes a Message to the + output-channel without + modifying it. + + + + + + + + + + + + + + + Defines an endpoint composed of a chain of Message + Handlers. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + 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 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 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) + + + + + + + + + + + + + + + + + + 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) + + + + + + + + + + + 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. + + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml index 9d6cac0efb..570e34d96d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml @@ -2,7 +2,7 @@ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml index 26228a7046..53e46f5f35 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml @@ -2,7 +2,7 @@ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml index 2f5fa9dfa6..0dea07557a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml index 1cdcc87adf..300315ae1e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-after-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-after-context.xml index feb3b0fb5c..d96e063f15 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-after-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-after-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-before-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-before-context.xml index 01e60a68fc..5ce379cb63 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-before-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-before-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-custom.xml b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-custom.xml index 7c6c3aea2c..43d8a2038b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-custom.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-custom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-usage-emptyref.xml b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-usage-emptyref.xml index 2aa9b55bb2..2c6a16c74c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-usage-emptyref.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-usage-emptyref.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/spring-integration-event/src/main/resources/META-INF/spring.schemas b/spring-integration-event/src/main/resources/META-INF/spring.schemas index b4fe05b048..b813c325cc 100644 --- a/spring-integration-event/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-event/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/event/spring-integration-event-2.0.xsd=org/springframework/integration/event/config/spring-integration-event-2.0.xsd http\://www.springframework.org/schema/integration/event/spring-integration-event-2.1.xsd=org/springframework/integration/event/config/spring-integration-event-2.1.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/event/spring-integration-event-2.2.xsd=org/springframework/integration/event/config/spring-integration-event-2.2.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..91a174aa06 --- /dev/null +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.2.xsd @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + 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-feed/src/main/resources/META-INF/spring.schemas b/spring-integration-feed/src/main/resources/META-INF/spring.schemas index a1e27e03d2..4c5994f815 100644 --- a/spring-integration-feed/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-feed/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.1.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd -http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.2.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd +http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..b9bda235d5 --- /dev/null +++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + 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-file/src/main/resources/META-INF/spring.schemas b/spring-integration-file/src/main/resources/META-INF/spring.schemas index 682b84f779..569ab6c341 100644 --- a/spring-integration-file/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-file/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd=org/springframework/integration/file/config/spring-integration-file-1.0.xsd http\://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd=org/springframework/integration/file/config/spring-integration-file-2.0.xsd http\://www.springframework.org/schema/integration/file/spring-integration-file-2.1.xsd=org/springframework/integration/file/config/spring-integration-file-2.1.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd=org/springframework/integration/file/config/spring-integration-file-2.2.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..7fc0e6f3ef --- /dev/null +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.2.xsd @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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-ftp/src/main/resources/META-INF/spring.schemas b/spring-integration-ftp/src/main/resources/META-INF/spring.schemas index 3ac1694641..9d3d10bb98 100644 --- a/spring-integration-ftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ftp/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd 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 new file mode 100644 index 0000000000..1b2d14cabf --- /dev/null +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + 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-gemfire/src/main/resources/META-INF/spring.schemas b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas index b542bdfd8c..22ab76ba3d 100644 --- a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,3 @@ -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd 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 new file mode 100644 index 0000000000..d5ceae6963 --- /dev/null +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + 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/test/java/org/springframework/integration/gemfire/store/gemfire-queue-config.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/gemfire-queue-config.xml index 2173ea5674..96f275dc89 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/gemfire-queue-config.xml +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/gemfire-queue-config.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/spring-integration-groovy/src/main/resources/META-INF/spring.schemas b/spring-integration-groovy/src/main/resources/META-INF/spring.schemas index 24b85b0e9e..1e5fcbfb11 100644 --- a/spring-integration-groovy/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-groovy/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..eb0efe1698 --- /dev/null +++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd @@ -0,0 +1,72 @@ + + + + + + + + + + + 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-http/src/main/resources/META-INF/spring.schemas b/spring-integration-http/src/main/resources/META-INF/spring.schemas index 67c216ac25..88201186f8 100644 --- a/spring-integration-http/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-http/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/http/spring-integration-http-1.0.xsd=org/springframework/integration/http/config/spring-integration-http-1.0.xsd http\://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd=org/springframework/integration/http/config/spring-integration-http-2.0.xsd http\://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd=org/springframework/integration/http/config/spring-integration-http-2.1.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/http/spring-integration-http-2.2.xsd=org/springframework/integration/http/config/spring-integration-http-2.2.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..6441ff2289 --- /dev/null +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd @@ -0,0 +1,690 @@ + + + + + + + + + + + + + + + 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. + + + + + + + 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. + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The expected type to which the response body should be converted. + + + + + + + + + + + + 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 be used as a fallback for any request Message does not contain the request URL Message header. + + + + + + + The HTTP method to use when executing requests with this adapter. + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defines common configuration for gateway adapters. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests-context.xml index cf885271ff..cfb75ab4b8 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests-context.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-http="http://www.springframework.org/schema/integration/http" - xsi:schemaLocation="http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-integration-ip/src/main/resources/META-INF/spring.schemas b/spring-integration-ip/src/main/resources/META-INF/spring.schemas index 63ccfbedb7..58dc7e5e00 100644 --- a/spring-integration-ip/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ip/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.1.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd -http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.2.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd \ 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 new file mode 100644 index 0000000000..0fb50eb009 --- /dev/null +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd @@ -0,0 +1,584 @@ + + + + + + + + + + + + + + + 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 true. + + + + + + + + + + + + + + + + + + + + + + + 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 true. + + + + + + + + + + + + + + + + + + + + + + + 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 true. + + + + + + + + + + + + + + + + + + + + + + + A connection factory is needed by an outbound adapter. The connection factory must be of 'client'. + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + +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. + + + + + + +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". + + + + + + + + + + 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/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests-context.xml index d4ad03c6d0..c31a64d54a 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests-context.xml +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int-ip="http://www.springframework.org/schema/integration/ip" xmlns:int="http://www.springframework.org/schema/integration" - xsi:schemaLocation="http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip-2.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas b/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas index 9cad3d1ad6..09d729d997 100644 --- a/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..ef2d80a345 --- /dev/null +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd @@ -0,0 +1,1316 @@ + + + + + + + + + + + + + + + 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 getting a response + 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 execute when a message is + received. If this is in a transaction then the + update will + roll back when the transaction does. + + + + + + + + + + + + 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. + + + + + + + + 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. + + + + + + + Indicates whether this procedure's return value + should be included. + + + + + + + + + + + + + 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. + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests-context.xml index 82c12e6629..067e3b3775 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests-context.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests-context.xml @@ -8,7 +8,7 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests-context.xml index b0b9d53e59..898fd657d8 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests-context.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests-context.xml @@ -8,7 +8,7 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests-context.xml index 62e7eaf171..bc4c83b079 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests-context.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests-context.xml @@ -8,7 +8,7 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/storedProcPollingChannelAdapterParserTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/storedProcPollingChannelAdapterParserTest.xml index deb68e566c..c451bb6589 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/storedProcPollingChannelAdapterParserTest.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/storedProcPollingChannelAdapterParserTest.xml @@ -5,7 +5,7 @@ xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-integration-jms/src/main/resources/META-INF/spring.schemas b/spring-integration-jms/src/main/resources/META-INF/spring.schemas index bfc6adf157..680e0174a4 100644 --- a/spring-integration-jms/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jms/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.1.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.2.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd \ 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 new file mode 100644 index 0000000000..389303aecd --- /dev/null +++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd @@ -0,0 +1,1266 @@ + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + Timeout for sending the mapped integration Message to this gateway's reply-channel. Default is indefinite. + + + + + + + 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. + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + 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-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests-context.xml index 7d13aa312d..71a6dc0e9b 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests-context.xml +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests-context.xml @@ -4,8 +4,8 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-jmx="http://www.springframework.org/schema/integration/jmx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd - http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config-custom-exporter.xml b/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config-custom-exporter.xml index 0452a971bf..1a716bd0f7 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config-custom-exporter.xml +++ b/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config-custom-exporter.xml @@ -4,8 +4,8 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-jmx="http://www.springframework.org/schema/integration/jmx" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd - http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config.xml b/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config.xml index a8f69d5d33..b8168e9dfd 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config.xml +++ b/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config.xml @@ -4,8 +4,8 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-jmx="http://www.springframework.org/schema/integration/jmx" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd - http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> diff --git a/spring-integration-mail/src/main/resources/META-INF/spring.schemas b/spring-integration-mail/src/main/resources/META-INF/spring.schemas index f34f3e9c93..82176f875b 100644 --- a/spring-integration-mail/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-mail/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.1.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.1.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.2.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..5f9b4eed18 --- /dev/null +++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + 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-redis/src/main/resources/META-INF/spring.schemas b/spring-integration-redis/src/main/resources/META-INF/spring.schemas index 76b691f990..0e3a800929 100644 --- a/spring-integration-redis/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-redis/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,3 @@ http\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.1.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd -http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.2.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..2a733d6c23 --- /dev/null +++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + Channel to which Error Messages will be sent. + + + + + + + + + + + + + + + + + + + + + + + + Defines an outbound Redis Message-sending Channel Adapter. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Common configuration for Redis adapters. + + + + + + + + + + + + + + + + diff --git a/spring-integration-rmi/src/main/resources/META-INF/spring.schemas b/spring-integration-rmi/src/main/resources/META-INF/spring.schemas index f289a6c331..2a6b2a4d78 100644 --- a/spring-integration-rmi/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-rmi/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-1.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-1.0.xsd http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..1dbeacf1d4 --- /dev/null +++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-scripting/src/main/resources/META-INF/spring.schemas b/spring-integration-scripting/src/main/resources/META-INF/spring.schemas index 0ad1b19997..039cd772c4 100644 --- a/spring-integration-scripting/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-scripting/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,6 @@ http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.1.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.1.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.1.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd \ 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 new file mode 100644 index 0000000000..fb01cd309e --- /dev/null +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd @@ -0,0 +1,41 @@ + + + + + + + + + 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-core-2.2.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd new file mode 100644 index 0000000000..a90d30156a --- /dev/null +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + 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-security/src/main/resources/META-INF/spring.schemas b/spring-integration-security/src/main/resources/META-INF/spring.schemas index c2fd3ac4bc..5f6bbfeea7 100644 --- a/spring-integration-security/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-security/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/security/spring-integration-security-1.0.xsd=org/springframework/integration/security/config/spring-integration-security-1.0.xsd http\://www.springframework.org/schema/integration/security/spring-integration-security-2.0.xsd=org/springframework/integration/security/config/spring-integration-security-2.0.xsd http\://www.springframework.org/schema/integration/security/spring-integration-security-2.1.xsd=org/springframework/integration/security/config/spring-integration-security-2.1.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-2.1.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-2.2.xsd=org/springframework/integration/security/config/spring-integration-security-2.2.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-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 new file mode 100644 index 0000000000..1fde07d437 --- /dev/null +++ b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.2.xsd @@ -0,0 +1,54 @@ + + + + + + + + + + + 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/META-INF/spring.schemas b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas index 816a9c91e2..54f05ace0a 100644 --- a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.1.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.1.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd 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 new file mode 100644 index 0000000000..860834339f --- /dev/null +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd @@ -0,0 +1,491 @@ + + + + + + + + + + + + + + + + + + + + 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-stream/src/main/resources/META-INF/spring.schemas b/spring-integration-stream/src/main/resources/META-INF/spring.schemas index ac3a230154..15c9721b59 100644 --- a/spring-integration-stream/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-stream/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd=org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd http\://www.springframework.org/schema/integration/stream/spring-integration-stream-2.0.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd http\://www.springframework.org/schema/integration/stream/spring-integration-stream-2.1.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.1.xsd -http\://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd +http\://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd \ No newline at end of file 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 new file mode 100644 index 0000000000..1f65e85ff0 --- /dev/null +++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + 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-twitter/src/main/resources/META-INF/spring.schemas b/spring-integration-twitter/src/main/resources/META-INF/spring.schemas index a2980702be..3ed3008633 100644 --- a/spring-integration-twitter/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-twitter/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.0.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.1.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd -http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.2.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.2.xsd +http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.2.xsd \ No newline at end of file diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.2.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.2.xsd new file mode 100644 index 0000000000..4d969ce032 --- /dev/null +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.2.xsd @@ -0,0 +1,196 @@ + + + + + + + + + + + + + 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-ws/src/main/resources/META-INF/spring.schemas b/spring-integration-ws/src/main/resources/META-INF/spring.schemas index 5648ffd484..99abec76f8 100644 --- a/spring-integration-ws/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ws/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.1.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.1.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.2.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.2.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.2.xsd \ No newline at end of file diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.2.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.2.xsd new file mode 100644 index 0000000000..a43efcf31f --- /dev/null +++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.2.xsd @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + Defines a Web Service based outbound Messaging Gateway. + + + + + + + + + + A unique identifier for this Gateway. + + + + + + + The channel where Messages should be sent to invoke the Web Service. + + + + + + + + + + + + The channel where Messages created from the Web Service responses will be sent. + This is optional. However, if non-empty responses are expected and this is not set, + then the request Messages must contain a REPLY_CHANNEL header. + + + + + + + + + + + + + + + + + Reference to a DestinationProvider implementation. Either provide this or a 'uri', never both. + See org.springframework.ws.client.support.destination.DestinationProvider for more detail. + + + + + + + + + + + + Reference to a Spring OXM Mashaller. If the Marshaller instance also implements + the Unmarshaller interface, then the 'unmarshaller' attribute is not required. + + + + + + + + + + + + Reference to a Spring OXM Unmarshaller. + + + + + + + + + + + + + + + + + Reference to a Spring Web Services SourceExtractor. + + + + + + + + + + + + Reference to a Spring Web Services WebServiceMessageCallback. This enables changing + the Web Service request message after the payload has been written to it but prior + to invocation of the actual Web Service. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Reference to the bean definition of a WebServiceMessageSender. + + + + + + + + + + + + Reference to the bean definition for a list or array of WebServiceMessageSenders. + + + + + + + Reference to the bean definition of a ClientInterceptor. + + + + + + + + + + + + Reference to the bean definition for a list or array of ClientInterceptors. + + + + + + + + + Reference to a HeaderMapper<SoapHeader> implementation + that this gateway will use to map between Spring Integration + MessageHeaders and the SoapHeader. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defines a Web Service based inbound Messaging Gateway. + + + + + + + + + + + + + + + + + + + + + + + + + Maximum time in milliseconds to wait for a reply from the downstream message flow initiated by this gateway. + This attribute is only relevant if at least some part of the downstream flow is asynchronous. + + + + + + + + + + + + If a (synchronous) downstream exception is thrown and an error-channel is specified, + the MessagingException will be sent to this channel. + + + + + + + + + + + + + + + + + + + + + + + + + + Reference to a HeaderMapper<SoapHeader> implementation + that this gateway will use to map between Spring Integration + MessageHeaders and the SoapHeader. + + + + + + + + + + + + + + + + + + + + + + + + + + Defines a Transformer for adding a SOAP Action value. + + + + + + + + + + + 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-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml index dcbf59650e..f7caed5fda 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int-ws="http://www.springframework.org/schema/integration/ws" xmlns:int="http://www.springframework.org/schema/integration" - xsi:schemaLocation="http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws-2.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-integration-xml/src/main/resources/META-INF/spring.schemas b/spring-integration-xml/src/main/resources/META-INF/spring.schemas index 444562cc73..459c40910e 100644 --- a/spring-integration-xml/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-xml/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,5 @@ http\://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.1.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.2.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.2.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.2.xsd \ No newline at end of file diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.2.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.2.xsd new file mode 100644 index 0000000000..9005fbc167 --- /dev/null +++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.2.xsd @@ -0,0 +1,752 @@ + + + + + + + + + + Defines the configuration elements for Spring Integration's XML support. + + + + + + + + Defines an XML marshalling transformer. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Specify whether to extract the payload before passing to the Marshaller. By default, this + value is "true". To have the full Message passed instead, set this to "false". + + + + + + + + + + + + + Defines an XML unmarshalling transformer. + + + + + + + + + + + + + + + + + + + + + + + Defines an XSLT transformer. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defines an XPath transformer. + + + + + + + + The XPath expression string to be evaluated against the input Message's payload. + Either this or 'xpath-expression-ref' must be provided, but not both. + + + + + + + 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. + + + + + + + + + + + + The result type expected from the XPath evaluation. This will be the payload type of the output Message. + + + + + + + + + + + + + + + + Reference to a NodeMapper. If this is provided, the 'evaluation-type' will be ignored. Instead, the + org.springframework.xml.xpath.XPathExpression's evaluateAsObject(Node node, NodeMapper nodeMapper) + method will be invoked. + + + + + + + + + + + + Specify the XmlPayloadConverter to use when converting a Message payload 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. + + + + + + + + + + + + + + + + + Defines a Header Enricher Message Transformer that evaluates XPath expressions against the + message payload and inserts the result of the evaluation into a message header. + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + Defines an XPath expression to be configured within an <xpath-header-enricher/> element. + + + + + + The name of the header to be enriched. + + + + + + + The XPath Expression as a String. Either this or 'xpath-expression-ref' must be provided, but not both. + + + + + + + The XPath Expression reference. Either this or 'xpath-expression' must be provided, but not both. + + + + + + + + + + + + The result type expected from the XPath evaluation. This will be the type of the header value. + + + + + + + + + + + + + + + + Boolean value to indicate whether this header value should overwrite an existing header value + for the same name if already present on the input Message. + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas b/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas index 4600cfcee2..ae2b8d8ef3 100644 --- a/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,4 @@ http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.1.xsd -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd \ 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 new file mode 100644 index 0000000000..763a44aa6d --- /dev/null +++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd @@ -0,0 +1,378 @@ + + + + + + + + + + + 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/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml index b84844315c..2b8ae4e176 100644 --- a/src/reference/docbook/whats-new.xml +++ b/src/reference/docbook/whats-new.xml @@ -276,7 +276,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> ...