diff --git a/build.gradle b/build.gradle index aa3f008d86..c9fd8df3db 100644 --- a/build.gradle +++ b/build.gradle @@ -230,29 +230,6 @@ subprojects { subproject -> ext.xLintArg = '-Xlint:all,-options,-processing' [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] - task checkTestConfigs { - inputs.files( - sourceSets.test.java.srcDirs.collect { - fileTree(it) - .include('**/*.xml') - .exclude('**/log4j2-test.xml') - }) - outputs.dir('build/resources') - doLast { - def wrongConfigs = inputs.files.filter { - new XmlParser(false, false) - .parse(it) - .@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/ - } - if (!wrongConfigs.empty) { - throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' + - wrongConfigs.collect { relativePath(it) }.join('\n') + - '\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' + - 'on different versions of dependencies.') - } - } - } - task updateCopyrights { onlyIf { !System.getenv('TRAVIS') && !System.getenv('bamboo_buildKey') } inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) }) @@ -310,7 +287,6 @@ subprojects { subproject -> tasks.withType(Test).all { // suppress all console output during testing unless running `gradle -i` logging.captureStandardOutput(LogLevel.INFO) - dependsOn checkTestConfigs if (name ==~ /(testAll)/) { systemProperty 'RUN_LONG_INTEGRATION_TESTS', 'true' @@ -1004,7 +980,7 @@ task schemaZip(type: Zip) { description = "Builds -${archiveClassifier} archive containing all " + "XSDs for deployment at static.springframework.org/schema." - duplicatesStrategy = 'exclude' + duplicatesStrategy = DuplicatesStrategy.EXCLUDE subprojects.findAll{ !it.name.endsWith('-bom') }.each { subproject -> Properties schemas = new Properties(); @@ -1022,8 +998,12 @@ task schemaZip(type: Zip) { it.path.replaceAll('\\\\', '/').endsWith(schemas.get(key)) } assert xsdFile != null - into ("integration/${shortName}") { + into ("integration/$shortName") { from xsdFile.path + rename { String fileName -> + String[] versionNumbers = project.version.split(/\./, 3) + fileName.replace('.xsd', "-${versionNumbers[0]}.${versionNumbers[1]}.xsd") + } } } } diff --git a/gradle.properties b/gradle.properties index 5e3ac4d6b9..d54e16687a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=5.2.3.BUILD-SNAPSHOT +version=5.3.0.BUILD-SNAPSHOT org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8 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 79bc04da9a..2165c778be 100644 --- a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,22 @@ -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd -https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd -https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-3.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.3.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-3.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.3.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd +https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.xsd similarity index 73% rename from spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd rename to spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.xsd index ffb9f80b56..43cb6768ca 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.xsd @@ -1,15 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/amqp" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> @@ -25,22 +25,26 @@ - Unique ID for this adapter. + 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" + 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" + type="org.springframework.messaging.MessageChannel"/> @@ -53,7 +57,7 @@ expected. - + @@ -70,7 +74,7 @@ - + @@ -93,9 +97,11 @@ - 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" + 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" @@ -112,9 +118,10 @@ - Configures a Consumer Endpoint for the 'org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint' - that will publish an AMQP Message to the provided Exchange and expect a reply Message. - The thread blocks waiting for a reply or timeout; uses 'RabbitTemplate.sendAndReceive()'. + Configures a Consumer Endpoint for the + 'org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint' + that will publish an AMQP Message to the provided Exchange and expect a reply Message. + The thread blocks waiting for a reply or timeout; uses 'RabbitTemplate.sendAndReceive()'. @@ -128,7 +135,7 @@ expected. - + @@ -141,9 +148,11 @@ - Configures a Consumer Endpoint for the 'org.springframework.integration.amqp.outbound.AsyncAmqpOutboundGateway' - that will publish an AMQP Message to the provided Exchange and expect a reply Message. - The sending thread returns immediately; the reply is sent asynchronously; uses 'AsyncRabbitTemplate.sendAndReceive()'. + Configures a Consumer Endpoint for the + 'org.springframework.integration.amqp.outbound.AsyncAmqpOutboundGateway' + that will publish an AMQP Message to the provided Exchange and expect a reply Message. + The sending thread returns immediately; the reply is sent asynchronously; uses + 'AsyncRabbitTemplate.sendAndReceive()'. @@ -157,7 +166,8 @@ - + @@ -183,7 +193,7 @@ - Message Channel to which converted Messages should be sent. + Message Channel to which converted Messages should be sent. @@ -195,7 +205,7 @@ - Message Channel where reply Messages will be expected. + Message Channel where reply Messages will be expected. @@ -233,7 +243,7 @@ - + @@ -263,7 +273,7 @@ - + @@ -274,7 +284,7 @@ - Creates a point-to-point channel that is backed by an AMQP Queue. + Creates a point-to-point channel that is backed by an AMQP Queue. @@ -283,29 +293,37 @@ - Indicate whether this channel should be message-driven (subscribable) or not (pollable). + 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. + 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. + 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. @@ -322,8 +340,8 @@ - Creates a publish-subscribe-channel that is backed by an AMQP FanoutExchange. - Always message-driven (subscribable). + Creates a publish-subscribe-channel that is backed by an AMQP FanoutExchange. + Always message-driven (subscribable). @@ -332,10 +350,12 @@ - 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. + 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. @@ -352,7 +372,7 @@ - Base type for 'channel' and 'publish-subscribe-channel'. + Base type for 'channel' and 'publish-subscribe-channel'. @@ -367,47 +387,53 @@ - Unique ID for this Message Channel. + Unique ID for this Message Channel. - The default delivery mode for messages; 'PERSISTENT' or 'NON_PERSISTENT'. Overridden if the 'header-mapper' - sets the delivery mode. The 'DefaultHeaderMapper' sets the value if the - Spring Integration message header 'amqp_deliveryMode' is present. If this attribute is not supplied and - the header mapper doesn't set it, the default depends on the underlying spring-amqp 'MessagePropertiesConverter' - used by the 'RabbitTemplate'. If that is not customized at all, the default is 'PERSISTENT'. + The default delivery mode for messages; 'PERSISTENT' or 'NON_PERSISTENT'. Overridden if the + 'header-mapper' + sets the delivery mode. The 'DefaultHeaderMapper' sets the value if the + Spring Integration message header 'amqp_deliveryMode' is present. If this attribute is not supplied + and + the header mapper doesn't set it, the default depends on the underlying spring-amqp + 'MessagePropertiesConverter' + used by the 'RabbitTemplate'. If that is not customized at all, the default is 'PERSISTENT'. - + - Set to 'true' to extract the message payload and map the o.s.messaging.Message to an o.s.amqp.core.Message in - a similar manner to a pair of channel adapters. When 'false' the entire message is converted requiring either - Java serializable contents or a custom message converter. Also see inbound and outbound mapped headers. - Also see 'headers-last', which only applies if this is 'true'. + Set to 'true' to extract the message payload and map the o.s.messaging.Message to an + o.s.amqp.core.Message in + a similar manner to a pair of channel adapters. When 'false' the entire message is converted + requiring either + Java serializable contents or a custom message converter. Also see inbound and outbound mapped + headers. + Also see 'headers-last', which only applies if this is 'true'. - The header mapper to use when sending and 'extract-payload' is true. The default mapper is - DefaultAmqpHeaderMapper.outboundMapper() which maps all headers except 'x-*'. + The header mapper to use when sending and 'extract-payload' is true. The default mapper is + DefaultAmqpHeaderMapper.outboundMapper() which maps all headers except 'x-*'. - The header mapper to use when receiving and 'extract-payload' is true. The default mapper is - DefaultAmqpHeaderMapper.inboundMapper() which maps all headers. + The header mapper to use when receiving and 'extract-payload' is true. The default mapper is + DefaultAmqpHeaderMapper.inboundMapper() which maps all headers. @@ -419,45 +445,50 @@ - Base type for the 'outbound-channel-adapter' and 'outbound-gateway' elements. + Base type for the 'outbound-channel-adapter' and 'outbound-gateway' elements. - + -The fixed name of the AMQP Exchange to which Messages should be sent. If not provided, Messages will be sent to the default, no-name Exchange. + The 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 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 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 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. + The order for this consumer when multiple consumers are registered thereby enabling load-balancing + and/or failover. @@ -471,7 +502,7 @@ Default: DefaultAmqpHeaderMapper. ]]> - + @@ -505,27 +536,31 @@ property set to TRUE. - The default delivery mode for messages; 'PERSISTENT' or 'NON_PERSISTENT'. Overridden if the 'header-mapper' - sets the delivery mode. The 'DefaultHeaderMapper' sets the value if the - Spring Integration message header 'amqp_deliveryMode' is present. If this attribute is not supplied and - the header mapper doesn't set it, the default depends on the underlying spring-amqp 'MessagePropertiesConverter' - used by the 'RabbitTemplate'. If that is not customized at all, the default is 'PERSISTENT'. + The default delivery mode for messages; 'PERSISTENT' or 'NON_PERSISTENT'. Overridden if the + 'header-mapper' + sets the delivery mode. The 'DefaultHeaderMapper' sets the value if the + Spring Integration message header 'amqp_deliveryMode' is present. If this attribute is not supplied + and + the header mapper doesn't set it, the default depends on the underlying spring-amqp + 'MessagePropertiesConverter' + used by the 'RabbitTemplate'. If that is not customized at all, the default is 'PERSISTENT'. - + - By default, the connection is established lazily, when the first message is sent. If you wish to detect - connection configuration problems during application initialization, set this to 'false'. - If the eager connection fails, an ERROR log will be emitted. + By default, the connection is established lazily, when the first message is sent. If you wish to + detect + connection configuration problems during application initialization, set this to 'false'. + If the eager connection fails, an ERROR log will be emitted. - + @@ -616,19 +651,20 @@ property set to TRUE. - Unique ID for this gateway. + 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 Messages should be sent in order to have them converted and + published to an AMQP Exchange. + type="org.springframework.messaging.MessageChannel"/> @@ -645,19 +681,20 @@ property set to TRUE. - Message Channel to which replies should be sent after being received from an AMQP Queue and converted. + Message Channel to which replies should be sent after being received from an AMQP Queue and + converted. + type="org.springframework.messaging.MessageChannel"/> - - + - + @@ -698,21 +735,21 @@ property set to TRUE. - - + + - Base type for the 'inbound-channel-adapter' and 'inbound-gateway' elements. + Base type for the 'inbound-channel-adapter' and 'inbound-gateway' elements. - Unique ID for this adapter. + Unique ID for this adapter. @@ -720,7 +757,7 @@ property set to TRUE. - Message Channel to which error Messages should be sent. + Message Channel to which error Messages should be sent. @@ -739,7 +776,7 @@ Default: DefaultAmqpHeaderMapper. ]]> - + @@ -759,7 +796,7 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - MessageConverter to use when receiving AMQP Messages. + MessageConverter to use when receiving AMQP Messages. @@ -783,7 +820,8 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA ]]> - + @@ -791,7 +829,7 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - Names of the AMQP Queues from which Messages should be consumed (comma-separated list). + Names of the AMQP Queues from which Messages should be consumed (comma-separated list). @@ -817,7 +855,7 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - Reference to the Rabbit ConnectionFactory to be used by this component. + Reference to the Rabbit ConnectionFactory to be used by this component. @@ -829,7 +867,7 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - MessagePropertiesConverter to use when receiving AMQP Messages. + MessagePropertiesConverter to use when receiving AMQP Messages. @@ -843,10 +881,11 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - 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. + 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. @@ -860,14 +899,14 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - The encoding to use when converting between byte arrays and Strings in message properties. + The encoding to use when converting between byte arrays and Strings in message properties. - Reference to a MessageConverter to be used by this RabbitTemplate. + Reference to a MessageConverter to be used by this RabbitTemplate. @@ -881,10 +920,13 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - Attributes for a SimpleMessageListenerContainer'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 messagePropertiesConverter. + Attributes for a SimpleMessageListenerContainer'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 messagePropertiesConverter. @@ -898,9 +940,9 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - Acknowledge Mode for the MessageListenerContainer; default 'AUTO' - meaning the adapter automatically acknowledges the message(s) - according to the tx-size. + Acknowledge Mode for the MessageListenerContainer; default 'AUTO' + meaning the adapter automatically acknowledges the message(s) + according to the tx-size. @@ -911,10 +953,10 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - + - Array of AOP Advice instances to be applied to the MessageListener. + Array of AOP Advice instances to be applied to the MessageListener. @@ -922,27 +964,29 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - 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, use 1 consumer for low-volume queues. Mutually exclusive with 'consumers-per-queue'. + 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, use 1 consumer for low-volume queues. Mutually exclusive with 'consumers-per-queue'. - Specify the number of consumers to create for each queue. - Setting this attribute creates a 'DirectMessageListenerContainer' instead of the default - 'SimpleMessageListenerContainer'. Refer to the Spring AMQP reference documentation for - more information about these containers. + Specify the number of consumers to create for each queue. + Setting this attribute creates a 'DirectMessageListenerContainer' instead of the default + 'SimpleMessageListenerContainer'. Refer to the Spring AMQP reference documentation for + more information about these containers. - ErrorHandler to be configured on the underlying MessageListener container. + ErrorHandler to be configured on the underlying MessageListener container. @@ -955,8 +999,9 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - Set whether to expose the listener Rabbit Channel to a registered ChannelAwareMessageListener as well as - to RabbitTemplate calls. + Set whether to expose the listener Rabbit Channel to a registered ChannelAwareMessageListener as + well as + to RabbitTemplate calls. @@ -965,8 +1010,9 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - 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. + 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. @@ -975,8 +1021,8 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - The timeout for each attempt by a consumer to receive the next message. - Not allowed when 'consumers-per-queue' is set. + The timeout for each attempt by a consumer to receive the next message. + Not allowed when 'consumers-per-queue' is set. @@ -985,7 +1031,8 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - The interval between recovery attempts, in milliseconds. The default is 5000 ms, that is, 5 seconds. + The interval between recovery attempts, in milliseconds. The default is 5000 ms, that is, 5 + seconds. @@ -994,7 +1041,8 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - The time to wait for workers in milliseconds after the container is stopped, and before the connection is forced closed. + The time to wait for workers in milliseconds after the container is stopped, and before the + connection is forced closed. @@ -1003,7 +1051,7 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - Reference to the Executor to be used for running Consumer threads. + Reference to the Executor to be used for running Consumer threads. @@ -1015,8 +1063,9 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - 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 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. @@ -1028,7 +1077,8 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - The PlatformTransactionManager to use when the Consumer receives the AMQP Message and the Listener is invoked. + The PlatformTransactionManager to use when the Consumer receives the AMQP Message and the + Listener is invoked. @@ -1040,9 +1090,10 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - 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. - Not allowed when 'consumers-per-queue' is set. + 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. + Not allowed when 'consumers-per-queue' is set. @@ -1051,15 +1102,19 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - If 'true', and none of the queues are available on the broker, the container will throw a fatal exception during - startup and will stop if the queues are deleted when the container is running (after making 3 attempts to - passively declare the queues). If false, the container will not throw an exception and go into recovery mode, - attempting to restart according to the 'recovery-interval'. Default 'true' unless 'consumers-per-queue' is set. + If 'true', and none of the queues are available on the broker, the container will throw a fatal + exception during + startup and will stop if the queues are deleted when the container is running (after making 3 + attempts to + passively declare the queues). If false, the container will not throw an exception and go into + recovery mode, + attempting to restart according to the 'recovery-interval'. Default 'true' unless + 'consumers-per-queue' is set. - + @@ -1075,7 +1130,7 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA - + 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 4f219db711..d34d1ffa40 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 @@ -18,20 +18,12 @@ package org.springframework.integration.config.xml; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.w3c.dom.Element; -import org.w3c.dom.Node; import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanDefinitionHolder; -import org.springframework.beans.factory.xml.BeanDefinitionDecorator; -import org.springframework.beans.factory.xml.BeanDefinitionParser; -import org.springframework.beans.factory.xml.NamespaceHandler; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.IntegrationRegistrar; -import org.springframework.util.StringUtils; /** * Base class for NamespaceHandlers that registers a BeanFactoryPostProcessor @@ -42,89 +34,17 @@ import org.springframework.util.StringUtils; * @author Gary Russell * @author Artem Bilan */ -public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHandler { - - private static final String VERSION = "5.2"; - - protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR final - - private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate(); +public abstract class AbstractIntegrationNamespaceHandler extends NamespaceHandlerSupport { private final AtomicBoolean initialized = new AtomicBoolean(); @Override public final BeanDefinition parse(Element element, ParserContext parserContext) { if (!this.initialized.getAndSet(true)) { - verifySchemaVersion(element, parserContext); IntegrationRegistrar integrationRegistrar = new IntegrationRegistrar(); integrationRegistrar.registerBeanDefinitions(null, parserContext.getRegistry()); } - return this.delegate.parse(element, parserContext); - } - - @Override - public final BeanDefinitionHolder decorate(Node source, BeanDefinitionHolder definition, - ParserContext parserContext) { - - return this.delegate.decorate(source, definition, parserContext); - } - - protected final void registerBeanDefinitionDecorator(String elementName, BeanDefinitionDecorator decorator) { - this.delegate.doRegisterBeanDefinitionDecorator(elementName, decorator); - } - - protected final void registerBeanDefinitionDecoratorForAttribute(String attributeName, - BeanDefinitionDecorator decorator) { - - this.delegate.doRegisterBeanDefinitionDecoratorForAttribute(attributeName, decorator); - } - - protected final void registerBeanDefinitionParser(String elementName, BeanDefinitionParser parser) { - this.delegate.doRegisterBeanDefinitionParser(elementName, parser); - } - - private void verifySchemaVersion(Element element, ParserContext parserContext) { - if (!(matchesVersion(element) && matchesVersion(element.getOwnerDocument().getDocumentElement()))) { - parserContext.getReaderContext().error( - "You cannot use prior versions of Spring Integration schemas with Spring Integration " + VERSION + - ". Please upgrade your schema declarations " + - "or use versionless aliases (e.g. spring-integration.xsd).", element); - } - } - - private static boolean matchesVersion(Element element) { - String schemaLocation = element.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "schemaLocation"); - return !StringUtils.hasText(schemaLocation) // no namespace on this element - || schemaLocation.matches("(?m).*spring-integration-[a-z-]*" + VERSION + ".xsd.*") // correct version - || schemaLocation.matches("(?m).*spring-integration[a-z-]*.xsd.*") // version-less schema - || !schemaLocation.matches("(?m).*spring-integration.*"); // no spring-integration schemas - } - - private class NamespaceHandlerDelegate extends NamespaceHandlerSupport { - - NamespaceHandlerDelegate() { - super(); - } - - @Override - public void init() { - AbstractIntegrationNamespaceHandler.this.init(); - } - - private void doRegisterBeanDefinitionDecorator(String elementName, BeanDefinitionDecorator decorator) { - super.registerBeanDefinitionDecorator(elementName, decorator); - } - - private void doRegisterBeanDefinitionDecoratorForAttribute(String attributeName, - BeanDefinitionDecorator decorator) { - - super.registerBeanDefinitionDecoratorForAttribute(attributeName, decorator); - } - - private void doRegisterBeanDefinitionParser(String elementName, BeanDefinitionParser parser) { - super.registerBeanDefinitionParser(elementName, parser); - } - + return super.parse(element, parserContext); } } 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 debd8f6145..c47a246748 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,24 @@ -http\://www.springframework.org/schema/integration/spring-integration-5.2.xsd=org/springframework/integration/config/spring-integration-5.2.xsd -http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-5.2.xsd -https\://www.springframework.org/schema/integration/spring-integration-5.2.xsd=org/springframework/integration/config/spring-integration-5.2.xsd -https\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-5.2.xsd +http\://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-2.1.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-2.2.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-3.0.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-4.0.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-4.1.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-4.2.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-4.3.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-5.0.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-5.1.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration-5.2.xsd=org/springframework/integration/config/spring-integration.xsd +http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-2.1.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-2.2.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-3.0.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-4.0.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-4.1.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-4.2.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-4.3.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-5.0.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-5.1.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration-5.2.xsd=org/springframework/integration/config/spring-integration.xsd +https\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration.xsd diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.2.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration.xsd similarity index 77% rename from spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.2.xsd rename to spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration.xsd index 6d28a8a53e..4a92cad9c9 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.2.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration.xsd @@ -1,11 +1,12 @@ + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:tool="http://www.springframework.org/schema/tool" + targetNamespace="http://www.springframework.org/schema/integration" elementFormDefault="qualified" + attributeFormDefault="unqualified"> - - + + - + @@ -43,7 +44,7 @@ - + @@ -56,7 +57,7 @@ - + @@ -68,16 +69,22 @@ - Allows you to configure org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory + Allows you to configure + org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory This implementation of org.springframework.integration.transaction.TransactionSynchronizationFactory allows you to configure SpEL expressions, with their execution being coordinated (synchronized) with a - transaction - see {TransactionSynchronization}. Expressions for before-commit, after.-commit, and after-rollback - are supported, together with a channel for each where the evaluation result (if any) will be sent. + transaction - see {TransactionSynchronization}. Expressions for before-commit, after.-commit, and + after-rollback + are supported, together with a channel for each where the evaluation result (if any) will be sent. For each sub-element you can specify 'expression' and/or 'channel' attributes. - If only the 'channel' attribute is present the received Message will be sent there as part of a particular synchronization scenario. - If only the 'expression' attribute is present and the result of an expression is a non-Null value, a Message with the - result as the payload will be generated and sent to a default channel (NullChannel) and will appear in the logs. - If you want the evaluation result to go to a specific channel add a 'channel' attribute. If the result of an expression is null + If only the 'channel' attribute is present the received Message will be sent there as part of a + particular synchronization scenario. + If only the 'expression' attribute is present and the result of an expression is a non-Null value, a + Message with the + result as the payload will be generated and sent to a default channel (NullChannel) and will appear in + the logs. + If you want the evaluation result to go to a specific channel add a 'channel' attribute. If the result + of an expression is null or void, no Message will be generated. @@ -115,7 +122,7 @@ - + - + @@ -168,7 +175,7 @@ - + @@ -194,11 +201,12 @@ - - + + Provides MessageDispatcher configuration - (i.e., failover, load-balancing, task-executor) + (i.e., failover, load-balancing, task-executor) + @@ -223,7 +231,7 @@ ]]> - + @@ -266,7 +274,7 @@ - + @@ -279,7 +287,7 @@ - + @@ -312,19 +320,21 @@ - - - - - - - - A reference to a bean that implements 'org.springframework.integration.store.PriorityCapableChannelMessageStore'. - A message store that supports priority in a manner defined by the store. When set, the underlying - channel will be a 'QueueChannel' that delegates to a 'MessageGroupQueue' backed by the store. - Not allowed if 'comparator' is set. - - + + + + + + + + A reference to a bean that implements + 'org.springframework.integration.store.PriorityCapableChannelMessageStore'. + A message store that supports priority in a manner defined by the store. When set, the underlying + channel will be a 'QueueChannel' that delegates to a 'MessageGroupQueue' backed by the store. + Not allowed if 'comparator' is set. + + @@ -345,18 +355,19 @@ - - - - - - - - A reference to a bean that implements the 'org.springframework.integration.dispatcher.LoadBalancingStrategy'. - This attribute is mutually exclusive with 'load-balancer'. - - - + + + + + + + + A reference to a bean that implements the + 'org.springframework.integration.dispatcher.LoadBalancingStrategy'. + This attribute is mutually exclusive with 'load-balancer'. + + + @@ -407,12 +418,12 @@ ]]> - + - + @@ -448,7 +459,7 @@ - + @@ -481,7 +492,7 @@ ]]> - + @@ -489,7 +500,7 @@ - - + @@ -533,7 +544,7 @@ ]]> - + @@ -545,8 +556,8 @@ Defines a message channel. - - + + @@ -578,7 +589,7 @@ - + @@ -592,7 +603,7 @@ - + @@ -633,7 +644,7 @@ - + @@ -659,7 +670,7 @@ - @@ -669,7 +680,7 @@ - - - + @@ -703,7 +714,7 @@ - + @@ -711,7 +722,7 @@ - - - + @@ -736,14 +747,14 @@ - - + @@ -761,7 +772,7 @@ - - - - - + @@ -826,7 +837,7 @@ - @@ -861,17 +872,17 @@ Defines a Messaging Gateway to be used within a chain. - + - - + @@ -879,7 +890,7 @@ - - + - - + + @@ -952,13 +963,13 @@ - + - + - - + + @@ -984,7 +995,7 @@ - + @@ -1008,7 +1019,7 @@ - + @@ -1031,8 +1042,10 @@ - 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. + 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. @@ -1088,8 +1101,10 @@ - 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 + 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. @@ -1122,11 +1137,11 @@ - + - A reference to a bean defined in the application context. + A reference to a bean defined in the application context. @@ -1134,7 +1149,7 @@ - + @@ -1155,12 +1170,12 @@ - + - + @@ -1176,7 +1191,7 @@ - + @@ -1184,18 +1199,18 @@ - + - - - + + + - + @@ -1210,9 +1225,9 @@ - + - + @@ -1233,7 +1248,7 @@ - + @@ -1284,12 +1299,12 @@ - + - A reference to a bean that implements the handler. - The bean can be an implementation of the MessageHandler interface or a POJO + A reference to a bean that implements the handler. + The bean can be an implementation of the MessageHandler interface or a POJO @@ -1297,11 +1312,11 @@ - + - A method defined on the bean referenced by 'ref' attribute + A method defined on the bean referenced by 'ref' attribute @@ -1319,12 +1334,12 @@ - + - A reference to a bean that implements the handler. - The bean can be an implementation of the MessageHandler interface or a POJO + A reference to a bean that implements the handler. + The bean can be an implementation of the MessageHandler interface or a POJO @@ -1332,11 +1347,11 @@ - + - A method defined on the bean referenced by 'ref' attribute + A method defined on the bean referenced by 'ref' attribute @@ -1357,7 +1372,7 @@ - + @@ -1380,14 +1395,16 @@ - Each header sub-element provides the name of a message header (via the required 'name' attribute). + Each header sub-element provides the name of a message header (via the required 'name' + attribute). 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 + The root object of the evaluation context is the Message that was returned from the flow + initiated by this enricher. - + @@ -1399,15 +1416,15 @@ - + - - + + @@ -1453,27 +1470,27 @@ - - - + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + + @@ -1508,12 +1525,12 @@ - + - - - + + - - - + + + - @@ -1604,7 +1621,7 @@ - + @@ -1620,7 +1637,7 @@ to proxy DelayHandler's 'release Message task'. - + Specify the SpEL expression that evaluates to the delay value in milliseconds, @@ -1628,8 +1645,8 @@ - - + + @@ -1638,7 +1655,7 @@ if the only Messages that should be delayed are those with a particular expression evaluation result. - + @@ -1654,7 +1671,7 @@ Specify whether Exceptions thrown by 'expression' evaluation should be ignored (only logged). In this case case the delayer will fall back to the - to the 'default-delay'. Default behaviour. + to the 'default-delay'. Default behaviour. If this attribute is specified as 'false', any 'expression' evaluation Exception will be thrown to the caller without falling back to the to the 'default-delay'. @@ -1670,10 +1687,10 @@ provided, the default scheduler registered in the ApplicationContext {ThreadPoolTaskScheduler} will be used. - + - + @@ -1684,15 +1701,15 @@ Provide a reference to the MessageStore instance that should be used to store Messages while awaiting the delay. - + - + - + @@ -1705,11 +1722,12 @@ - - - + + + - + @@ -1733,7 +1751,7 @@ - + @@ -1747,7 +1765,7 @@ - + @@ -1769,7 +1787,8 @@ - + @@ -1783,7 +1802,7 @@ - + @@ -1804,11 +1823,11 @@ - - + + - - + + @@ -1824,68 +1843,68 @@ - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1897,10 +1916,10 @@ - + - + @@ -1980,7 +1999,7 @@ - + @@ -2008,7 +2027,7 @@ - + @@ -2026,8 +2045,8 @@ - - + + @@ -2039,10 +2058,10 @@ - - + + - + - - - - + + + + @@ -2069,7 +2088,7 @@ - + @@ -2088,7 +2107,7 @@ - + @@ -2097,7 +2116,7 @@ - + @@ -2114,7 +2133,7 @@ - + @@ -2125,26 +2144,28 @@ - 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 '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. - Converts the 'replyChannel' and 'errorChannel' headers to a String after registering it in the HeaderChannelRegistry. - Use this when a message is serialized for any reason. No changes are made - if the header does not exist, or if the header does not currently reference a MessageChannel. + Converts the 'replyChannel' and 'errorChannel' headers to a String after registering it in the + HeaderChannelRegistry. + Use this when a message is serialized for any reason. No changes are made + if the header does not exist, or if the header does not currently reference a MessageChannel. - Overrides the header channel registry default 'reaperDelay' - specifies the minimum time - that the mapping will remain in the registry, in milliseconds. + Overrides the header channel registry default 'reaperDelay' - specifies the minimum time + that the mapping will remain in the registry, in milliseconds. @@ -2153,23 +2174,24 @@ - 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 '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 'correlationId' header - Shortcut to specify a value for the 'expirationDate' header (java.lang.Long). + Shortcut to specify a value for the 'expirationDate' header (java.lang.Long). @@ -2192,7 +2214,7 @@ - + @@ -2202,14 +2224,14 @@ Element that accepts any user-defined header name/value pair. - + - + Allows you to configure Message Poller if this endpoint is a Polling Consumer - + @@ -2227,10 +2249,10 @@ existing ones with the same header names. - + - + @@ -2241,10 +2263,10 @@ skipped. The default value is true. Set this to false if a null value should trigger removal of the corresponding header instead. - + - + @@ -2254,9 +2276,9 @@ The 'method' attribute is required along with this. - + - + @@ -2266,7 +2288,7 @@ Method to be invoked on the referenced Object as specified by the 'ref' attribute. The method should return a Map with String-typed keys. - + @@ -2274,7 +2296,7 @@ - + @@ -2314,7 +2336,7 @@ - + @@ -2351,7 +2373,7 @@ Reference to be associated with the given header name. - + @@ -2362,7 +2384,7 @@ - + @@ -2376,7 +2398,7 @@ - + @@ -2391,7 +2413,7 @@ - + @@ -2419,10 +2441,10 @@ - + - + @@ -2436,7 +2458,7 @@ - + @@ -2455,7 +2477,7 @@ - + @@ -2472,7 +2494,7 @@ - + @@ -2498,7 +2520,8 @@ - + @@ -2518,7 +2541,7 @@ - + @@ -2526,7 +2549,7 @@ - + @@ -2544,12 +2567,12 @@ - + - + @@ -2563,7 +2586,7 @@ - + @@ -2571,7 +2594,7 @@ - + @@ -2596,7 +2619,7 @@ - + @@ -2611,17 +2634,17 @@ - + - + - - - + + + @@ -2635,7 +2658,7 @@ - + @@ -2643,7 +2666,7 @@ - + @@ -2660,12 +2683,12 @@ - + - + @@ -2679,7 +2702,7 @@ - + @@ -2687,7 +2710,7 @@ - + @@ -2698,12 +2721,12 @@ - + - + @@ -2717,7 +2740,7 @@ - + @@ -2725,7 +2748,7 @@ - + @@ -2736,7 +2759,7 @@ - + @@ -2750,21 +2773,22 @@ - + Defines a Consumer Endpoint for the - 'org.springframework.integration.transformer.SyslogToMapTransformer' that converts an RFC5424 packet to a + 'org.springframework.integration.transformer.SyslogToMapTransformer' that converts an RFC5424 packet to + a Map. - + @@ -2783,7 +2807,7 @@ - + @@ -2805,7 +2829,7 @@ - + @@ -2817,23 +2841,23 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + @@ -2846,43 +2870,43 @@ - - + + - - - - + + + + - - + + - - - - - - + + + + + + - - - + + + - - - 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'. - - - - - + + + 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'. + + + + + - - - + + + @@ -2895,7 +2919,7 @@ - + @@ -2904,9 +2928,9 @@ - + - + @@ -2936,7 +2960,7 @@ - + @@ -2945,8 +2969,8 @@ - - + + @@ -2969,35 +2993,35 @@ - + - The channel where the filter will send the messages that were dropped + The channel where the filter will send the messages that were dropped - Throw an exception if the filter rejects the message (default false). + Throw an exception if the filter rejects the message (default false). - + - + - - - + + + Defines a Consumer Endpoint for the 'org.springframework.integration.router.HeaderValueRouter'. The 'header-name' attribute specifies which @@ -3005,185 +3029,185 @@ channel to be resolved. Alternatively, 1 or more 'mapping' sub-elements may be provided with expected header values mapped to channels. - - + + - - - - Defines a Consumer Endpoint for the + + + + Defines a Consumer Endpoint for the 'org.springframework.integration.router.RecipientListRouter'. - A RecipientListRouter will send - each received Message to a statically defined list of Message Channels. + A RecipientListRouter will send + each received Message to a statically defined list of Message Channels. - Another convenient option when configuring a RecipientListRouter - is to define the 'selector-expression' for the 'mapping' sub elements. - The 'selector-expression' uses Spring Expression Language (SpEL) - and can be used as selectors for individual recipient channels. + Another convenient option when configuring a RecipientListRouter + is to define the 'selector-expression' for the 'mapping' sub elements. + The 'selector-expression' uses Spring Expression Language (SpEL) + and can be used as selectors for individual recipient channels. - This is similar to using a Filter at the beginning of 'chain' to - act as a "Selective Consumer". However, in this case, it's all - combined rather concisely into the router's configuration. - - - + This is similar to using a Filter at the beginning of 'chain' to + act as a "Selective Consumer". However, in this case, it's all + combined rather concisely into the router's configuration. + + + - - - + + + Defines a Consumer Endpoint for the 'org.springframework.integration.router.PayloadTypeRouter'. The 'mapping' sub-elements specify the associations between Java types and target channels. - - + + - - - + + + Defines a Consumer Endpoint for the 'org.springframework.integration.router.ErrorMessageExceptionTypeRouter' which resolves the target MessageChannel for messages whose payload is an Exception. The channel resolution is based upon the most specific cause of the error for which a channel mapping exists. - - + + - - - + + + Defines a Consumer Endpoint for the 'org.springframework.integration.router.AbstractMessageProcessingRouter' implementation that serves as an adapter for invoking a method on any Spring-managed object as specified by the "ref" and "method" attributes. - - + + - + --> - + - - - - - - - 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. + + + + + + + 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. + 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. + 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. + 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. + 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. + 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. + 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. + 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. + 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)" - - - - - - + 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 @@ -3297,71 +3322,72 @@ - + - - - - - + + + + + - - - - - - - + + + + + + + ). ]]> - - - - - - - + + + + + + + - - - - - - - - + + + + + + + ) ]]> - - - - - - + + + + + + - + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + ) @@ -3370,22 +3396,23 @@ by navigating the hierarchy of 'exception causes' (e.g., payload.getCause()). ]]> - - - - - - - + + + + + + + - - - - - - - - + + + + + + + ) @@ -3394,148 +3421,148 @@ 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') - - - - - - - - - + + + + + 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. - - - - - - + + + + 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 receiving Message channel of this endpoint - - - - - - + + + + + + + + + The receiving Message channel of this endpoint + + + + + + - - + + - + - + @@ -3548,25 +3575,25 @@ ]]> - - - - 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. + + + + 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. - - - - - - - - + If you would like to silently drop those messages instead, + add the "nullChannel" as the default output channel attribute + value. + + + + + + + + @@ -3594,8 +3621,8 @@ ]]> - - + + @@ -3604,28 +3631,28 @@ Message. Defaults to false. - - - + + + - - - - Specify whether channel names must always be successfully resolved - to existing channel instances. + + + + 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 unresolvable channels to be ignored. + If set to 'true', a MessagingException will be raised in case + the channel cannot be resolved. Setting this attribute to 'false', + will cause any unresolvable channels to be ignored. - If not explicitly set, 'resolution-required' will - default to 'true'. - - - - - - + If not explicitly set, 'resolution-required' will + default to 'true'. + + + + + + @@ -3639,7 +3666,7 @@ - + @@ -3673,7 +3700,7 @@ - + @@ -3696,7 +3723,7 @@ - + @@ -3721,14 +3748,14 @@ - + - + @@ -3750,48 +3777,49 @@ 'transactional' or 'advice-chain' are applied only to 'forceComplete' operation. - - + + - + 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 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) + 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) + - + @@ -3805,7 +3833,7 @@ - + @@ -3816,7 +3844,9 @@ - A SpEL expression to evaluate against a root object that is the Collection of messages within the message group (e.g, size() > 6) + A SpEL expression to evaluate against a root object that is the Collection of + messages within the message group (e.g, size() > 6) + @@ -3835,7 +3865,8 @@ - A SpEL expression to evaluate a 'group-timeout' with the MessageGroup as the #root evaluation + A SpEL expression to evaluate a 'group-timeout' with the MessageGroup as the #root + evaluation context object for scheduling the MessageGroup forced completion, when the 'ReleaseStrategy' does not 'release' the group when the current Message arrives. If 'group-timeout-expression' evaluates to 'null' or less than '0', @@ -3850,7 +3881,7 @@ - + @@ -3876,7 +3907,7 @@ - + @@ -3889,14 +3920,14 @@ - + - + @@ -3910,12 +3941,13 @@ - + - The channel where the aggregator will send the messages that timed out (if send-partial-results- - on-expiry is 'false'). + The channel where the aggregator will send the messages that timed out (if + send-partial-results- + on-expiry is 'false'). @@ -3927,10 +3959,10 @@ 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. - + - + @@ -3938,11 +3970,15 @@ - 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.expireMessageGroups(timeout). That could be accomplished via a ControlBus operation - or by simply invoking that method if you have a reference to the MessageGroupStore instance. + 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.expireMessageGroups(timeout). That could be accomplished via a ControlBus + operation + or by simply invoking that method if you have a reference to the MessageGroupStore instance. @@ -3975,7 +4011,7 @@ - + @@ -3992,7 +4028,7 @@ - + @@ -4010,7 +4046,7 @@ are released. This is mutually exclusive with the release-strategy attribute (either or none can be specified , but not both). - + @@ -4037,12 +4073,13 @@ - + - Reference to a bean in this Application Context that implements ChannelInterceptor - + Reference to a bean in this Application Context that implements ChannelInterceptor + @@ -4050,12 +4087,12 @@ - Allows you to configure a Wire Tap interceptor that will send a copy of the message to a - channel identified by 'channel' attribute. + Allows you to configure a Wire Tap interceptor that will send a copy of the message to a + channel identified by 'channel' attribute. - + @@ -4066,12 +4103,12 @@ Defines a Wire Tap Channel Interceptor. - + - + @@ -4079,24 +4116,24 @@ - 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. Mutually exclusive with 'selector-expression'. + 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. Mutually exclusive with 'selector-expression'. - A boolean expression evaluated against the message to determine whether it should - sent to the intercepting channel. Mutually exclusive with 'selector'. + A boolean expression evaluated against the message to determine whether it should + sent to the intercepting channel. Mutually exclusive with 'selector'. - The timeout for sending the message to the intercepting channel + The timeout for sending the message to the intercepting channel @@ -4110,7 +4147,7 @@ ]]> - + @@ -4149,7 +4186,7 @@ ]]> - + - + @@ -4166,28 +4204,28 @@ - - - - - - - + + + + + + + - - - - - + + + + + - + @@ -4199,17 +4237,17 @@ - + - + - + - + @@ -4234,15 +4273,15 @@ - + - - + + @@ -4251,11 +4290,12 @@ - - - - - + + + + + @@ -4275,7 +4315,7 @@ - + @@ -4286,9 +4326,9 @@ - - - + + + @@ -4316,7 +4356,7 @@ - + @@ -4327,8 +4367,8 @@ - - + + @@ -4349,19 +4389,19 @@ - - - + + + - - + + - + @@ -4369,7 +4409,7 @@ - + - + @@ -4385,41 +4425,41 @@ - + Defines a 'org.springframework.integration.channel.interceptor.WireTap' bean. - - - - - - - [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) - - - - - - - + + + + + + + [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) + + + + + + + @@ -4431,9 +4471,9 @@ - + - + @@ -4471,10 +4511,11 @@ - 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. + 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. @@ -4485,7 +4526,7 @@ unless bean with this name is already registered. - + @@ -4510,7 +4551,7 @@ unless bean with this name is already registered. - @@ -4529,9 +4570,9 @@ The list of component name patterns you want to track (e.g., tracked-components - + - + @@ -4544,34 +4585,34 @@ The list of component name patterns you want to track (e.g., tracked-components - - - - Specifies the name of the SpEL function. - - - - - - - The fully qualified class name where to find the static method for SpEL function. - - - - - - - - - - - - The method signature in the form 'methodName[([arg_list])]', - where 'arg_list' is an optional, comma-separated list of fully-qualified - type names. - - - + + + + Specifies the name of the SpEL function. + + + + + + + The fully qualified class name where to find the static method for SpEL function. + + + + + + + + + + + + The method signature in the form 'methodName[([arg_list])]', + where 'arg_list' is an optional, comma-separated list of fully-qualified + type names. + + + @@ -4585,8 +4626,8 @@ The list of component name patterns you want to track (e.g., tracked-components - - + + @@ -4595,7 +4636,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4604,7 +4645,8 @@ The list of component name patterns you want to track (e.g., tracked-components - Defines a Consumer Endpoint for the 'org.springframework.integration.scattergather.ScatterGatherHandler'. + Defines a Consumer Endpoint for the + 'org.springframework.integration.scattergather.ScatterGatherHandler'. @@ -4613,7 +4655,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4677,7 +4719,8 @@ The list of component name patterns you want to track (e.g., tracked-components Specify whether the Scatter-Gather must return a non-null value. This value is 'true' by default, hence a ReplyRequiredException will be thrown when the underlying aggregator returns a null value after 'gather-timeout'. - Note, if 'null' is a possibility, the 'gather-timeout' should be specified to avoid an indefinite wait. + Note, if 'null' is a possibility, the 'gather-timeout' should be specified to avoid an indefinite + wait. @@ -4686,8 +4729,8 @@ The list of component name patterns you want to track (e.g., tracked-components - Defines an 'org.springframework.integration.handler.advice.IdempotentReceiverInterceptor' bean. - + Defines an 'org.springframework.integration.handler.advice.IdempotentReceiverInterceptor' bean. + @@ -4706,7 +4749,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4720,7 +4763,8 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4736,7 +4780,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4761,7 +4805,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4769,7 +4813,8 @@ The list of component name patterns you want to track (e.g., tracked-components 'org.springframework.integration.selector.MetadataStoreSelector'. Evaluates a 'value' for the 'idempotentKey' from the request Message. Mutually exclusive with 'selector' and 'value-expression'. - By default, the 'MetadataStoreSelector' uses the 'timestamp' message header as the Metadata 'value'. + By default, the 'MetadataStoreSelector' uses the 'timestamp' message header as the Metadata + 'value'. @@ -4789,7 +4834,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4874,7 +4919,8 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4898,7 +4944,7 @@ The list of component name patterns you want to track (e.g., tracked-components 3) get/set or shutdown methods on configurable TaskExecutors or TaskSchedulers ]]> - + @@ -4991,11 +5037,12 @@ The list of component name patterns you want to track (e.g., tracked-components - + - Identifies the Message channel where Message will be sent after it's being processed by this endpoint + Identifies the Message channel where Message will be sent after it's being processed by this + endpoint @@ -5014,11 +5061,11 @@ The list of component name patterns you want to track (e.g., tracked-components - + - The receiving Message channel of this endpoint + The receiving Message channel of this endpoint @@ -5032,7 +5079,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. ]]> - + @@ -5123,7 +5170,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. ]]> - + @@ -5149,9 +5196,9 @@ See 'SmartLifecycleRoleController'. -When fetching objects from some external resource, limit the number of such objects that -will be retrieved on each fetch. A negative value (default) indicates no limit; a value -of zero effectively disables fetching remote objects. + When fetching objects from some external resource, limit the number of such objects that + will be retrieved on each fetch. A negative value (default) indicates no limit; a value + of zero effectively disables fetching remote objects. @@ -5159,12 +5206,12 @@ of zero effectively disables fetching remote objects. - - - - - - + + + + + + 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 12a17543b2..94b39c02ad 100644 --- a/spring-integration-event/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-event/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,24 @@ -http\://www.springframework.org/schema/integration/event/spring-integration-event-5.2.xsd=org/springframework/integration/event/config/spring-integration-event-5.2.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-5.2.xsd -https\://www.springframework.org/schema/integration/event/spring-integration-event-5.2.xsd=org/springframework/integration/event/config/spring-integration-event-5.2.xsd -https\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-5.2.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-2.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-2.1.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-2.2.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-3.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-4.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-4.1.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-4.2.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-4.3.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-5.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-5.1.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-5.2.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-2.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-2.1.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-2.2.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-3.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-4.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-4.1.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-4.2.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-4.3.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-5.0.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-5.1.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event-5.2.xsd=org/springframework/integration/event/config/spring-integration-event.xsd +https\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event.xsd diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event.xsd similarity index 93% rename from spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd rename to spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event.xsd index 0c4ab91d0a..f6142cd98e 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event.xsd @@ -1,14 +1,14 @@ + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/feed" + elementFormDefault="qualified"> - + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> @@ -22,7 +21,7 @@ - + @@ -37,7 +36,7 @@ - + @@ -62,7 +61,7 @@ - + @@ -74,7 +73,7 @@ - + @@ -89,7 +88,7 @@ - + @@ -102,7 +101,7 @@ - + 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 b86ee2c9df..daad3c2f9a 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,24 @@ -http\://www.springframework.org/schema/integration/file/spring-integration-file-5.2.xsd=org/springframework/integration/file/config/spring-integration-file-5.2.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-5.2.xsd -https\://www.springframework.org/schema/integration/file/spring-integration-file-5.2.xsd=org/springframework/integration/file/config/spring-integration-file-5.2.xsd -https\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-5.2.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-2.1.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-4.2.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-4.3.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-5.1.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-5.2.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-2.1.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-4.2.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-4.3.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-5.1.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file-5.2.xsd=org/springframework/integration/file/config/spring-integration-file.xsd +https\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file.xsd diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file.xsd similarity index 56% rename from spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd rename to spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file.xsd index 4079b228ce..053c7a619b 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file.xsd @@ -1,38 +1,36 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/file" + elementFormDefault="qualified"> - - + + - - + - + - - - + + + Configures a 'SourcePollingChannelAdapter' Endpoint for the 'org.springframework.integration.file.FileReadingMessageSource' that polls a directory and sends Messages whose payloads are instances of java.io.File. - - - - + + + + - - + + @@ -45,37 +43,37 @@ - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - - - + + + + + + + - - - + + - - - - - + + + + - - - - - + + + + + Reference to a custom DirectoryScanner implementation. Mutually exclusive with 'use-watch-service' attribute. - - - - - - - + + + + + + + @@ -139,19 +137,21 @@ Only files matching this regular expression will be picked up by this adapter. - + + ]]> + - - - + + - - - - - - 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. - - - + + + + + + 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. + + + @@ -193,8 +194,8 @@ Only files matching this regular expression will be picked up by this adapter. - - + + @@ -206,154 +207,158 @@ Only files matching this regular expression will be picked up by this adapter. - - + + Configures a Consumer Endpoint for the 'org.springframework.integration.file.FileWritingMessageHandler' with 'expectReply = false' that writes Message payloads to a File. - - - - - - - The channel through which outgoing messages will arrive. - - - - - - - - - - - + + + + + + + The channel through which outgoing messages will arrive. + + + + + + + + + + + + - - - + + + Configures a Message Producing Endpoint for the 'org.springframework.integration.file.tail.FileTailingMessageProducerSupport that 'tails' a file on the filesystem. - - + + - - - - Configures the adapter to exec 'tail' with these options (appended by the file name). - Default: "-F -n 0" (follow the filename and emit no - existing lines). This attribute is not allowed if 'delay' 'end' or 'reopen' is - specified, which cause the Apache commons-io 'Tailer' class to be used instead of - using a native 'tail' command. - - - - - - - Configure the adapter to either start a thread for capturing stderr or not. - Default: True - - - - - - - - - - The fully qualified name of the file to be tailed. - - - - - - - A reference to a TaskExecutor; the default is a SimpleAsyncTaskExecutor; the - native adapter uses three threads - one for reading stdout, one for - reading stderr and one for monitoring the process. - - - - - - - - - - - - A reference to a TaskScheduler; the default is the 'taskScheduler' bean - which is automatically configured for all Spring Integration applications. - The scheduler is used by the native adapter to reschedule - the 'tail' process after a failure according to the 'file-delay', and also - it is used to emit idle event. - - - - - - - - - - - - The delay in milliseconds between attempts to open the file when no file was found (Apache adapter). - For the native adapter, this is used as a delay before starting a new process after process failures. - On some platforms, when the file doesn't exist, the 'tail' process is suspended until the file - appears; on other platforms, the 'tail' process exits immediately if the file doesn't exist. - Default 5000. - - - - - - - Does not apply to the native adapter - the delay in milliseconds between polls when no new - data was detected in the file. Default 1000. Note: Setting this option forces the use of the Apache - Tailer implementation instead of the native 'tail' command. - - - - - - - The delay in milliseconds between idle events when no new lines are being tailed. - - - - - - - Does not apply to the native adapter. - Set to 'true' to tail from the end of the file, 'false' to tail from the beginning of the file. - Default 'true'. Note: Setting this option forces the use of the Apache - Tailer implementation instead of the native 'tail' command. - - + + + + Configures the adapter to exec 'tail' with these options (appended by the file name). + Default: "-F -n 0" (follow the filename and emit no + existing lines). This attribute is not allowed if 'delay' 'end' or 'reopen' is + specified, which cause the Apache commons-io 'Tailer' class to be used instead of + using a native 'tail' command. + + + + + + + Configure the adapter to either start a thread for capturing stderr or not. + Default: True + + - - - - - Does not apply to the native adapter. - If 'true', close and reopen the file between reading chunks. - Default 'false'. Note: Setting this option forces the use of the Apache - Tailer implementation instead of the native 'tail' command. - - + + + + + The fully qualified name of the file to be tailed. + + + + + + + A reference to a TaskExecutor; the default is a SimpleAsyncTaskExecutor; the + native adapter uses three threads - one for reading stdout, one for + reading stderr and one for monitoring the process. + + + + + + + + + + + + A reference to a TaskScheduler; the default is the 'taskScheduler' bean + which is automatically configured for all Spring Integration applications. + The scheduler is used by the native adapter to reschedule + the 'tail' process after a failure according to the 'file-delay', and also + it is used to emit idle event. + + + + + + + + + + + + The delay in milliseconds between attempts to open the file when no file was found (Apache + adapter). + For the native adapter, this is used as a delay before starting a new process after process + failures. + On some platforms, when the file doesn't exist, the 'tail' process is suspended until the file + appears; on other platforms, the 'tail' process exits immediately if the file doesn't exist. + Default 5000. + + + + + + + Does not apply to the native adapter - the delay in milliseconds between polls when no new + data was detected in the file. Default 1000. Note: Setting this option forces the use of the + Apache + Tailer implementation instead of the native 'tail' command. + + + + + + + The delay in milliseconds between idle events when no new lines are being tailed. + + + + + + + Does not apply to the native adapter. + Set to 'true' to tail from the end of the file, 'false' to tail from the beginning of the file. + Default 'true'. Note: Setting this option forces the use of the Apache + Tailer implementation instead of the native 'tail' command. + + - + + + + + Does not apply to the native adapter. + If 'true', close and reopen the file between reading chunks. + Default 'false'. Note: Setting this option forces the use of the Apache + Tailer implementation instead of the native 'tail' command. + + + + + + @@ -366,44 +371,45 @@ Only files matching this regular expression will be picked up by this adapter. - - + + - - - + + + Configures a Consumer Endpoint for the 'org.springframework.integration.file.FileWritingMessageHandler' 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. - - - - - - - - - - - + + + + + + + The channel through which outgoing messages will arrive. + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + @@ -472,74 +480,74 @@ Only files matching this regular expression will be picked up by this adapter. - - - - - - - - - - - - - + - Allows you to provide a SpEL expression which will compute the file name of - the target file (e.g., assuming payload is java.io.File "payload.name + '.transferred'"); + + + + + + + + + + + + + Allows you to provide a SpEL expression which will compute the file name of + the target file (e.g., assuming payload is java.io.File "payload.name + '.transferred'"); - - - + + + Extension used when uploading files. We change it after we know it's uploaded. This attribute is mutually exclusive with 'append' since the append is done to the actual file and not its temporary counterpart. The default value of this attribute (i.e., .writing) is ignored when 'append' is set to true. - - + + - - - - + + + - - - - - + + + + - - - - - + + + + + Specify whether to automatically create the destination 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. - - - - - - - Set the charset name to use when writing a File from a String-based - Message payload, e.g. charset="UTF-8". If not set, the default charset of this - Java virtual machine is used. - - + 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. + + + + + + + Set the charset name to use when writing a File from a String-based + Message payload, e.g. charset="UTF-8". If not set, the default charset of this + Java virtual machine is used. + + @@ -592,7 +600,7 @@ Only files matching this regular expression will be picked up by this adapter. + type="org.springframework.integration.file.FileWritingMessageHandler.MessageFlushPredicate"/> @@ -608,96 +616,96 @@ Only files matching this regular expression will be picked up by this adapter. - + - + - - - + + + Creates a 'org.springframework.integration.file.transformer.FileToStringTransformer' that converts a File payload to a String. - - - - - + + + + + - - + - + - - - - - + + + + + - - - + + + Creates a 'org.springframework.integration.file.transformer.FileToByteArrayTransformer' that converts a File payload to an array of bytes. - - - - - - - + + + + + + + - + - + + minOccurs="0" maxOccurs="1"/> - - + + Identifies the underlying Spring bean definition (EventDrivenConsumer) - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + @@ -708,14 +716,16 @@ Only files matching this regular expression will be picked up by this adapter. - - - + + + - + - + + @@ -810,7 +820,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -822,34 +832,34 @@ Only files matching this regular expression will be picked up by this adapter. - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - @@ -948,7 +958,7 @@ Only files matching this regular expression will be picked up by this adapter. + type="xsd:string"> Specify a SpEL expression which @@ -960,7 +970,7 @@ Only files matching this regular expression will be picked up by this adapter. + default="false"> Specify whether to automatically create the @@ -978,13 +988,13 @@ Only files matching this regular expression will be picked up by this adapter. + type="org.springframework.integration.file.FileNameGenerator"/> + type="xsd:string"> Allows you to provide SpEL expression which @@ -1002,7 +1012,7 @@ Only files matching this regular expression will be picked up by this adapter. - + 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 9550dde8a7..3ff28dd599 100644 --- a/spring-integration-ftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ftp/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,24 @@ -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd -https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd -https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-3.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.3.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-3.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.3.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd +https\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp.xsd diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp.xsd similarity index 93% rename from spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd rename to spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp.xsd index ac7f47d01f..973712aa7a 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp.xsd @@ -1,18 +1,18 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + xmlns:int-file="http://www.springframework.org/schema/integration/file" + targetNamespace="http://www.springframework.org/schema/integration/ftp" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/file/spring-integration-file.xsd"/> @@ -27,7 +27,8 @@ - + @@ -62,8 +63,8 @@ - - + + @@ -109,7 +110,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -125,7 +126,7 @@ + use="required"> Identifies the directory path (e.g., @@ -135,7 +136,7 @@ + type="xsd:string"> Tells this adapter if the local directory must @@ -169,7 +170,7 @@ + type="org.springframework.integration.file.DirectoryScanner"/> @@ -182,7 +183,7 @@ + type="org.springframework.integration.metadata.MetadataStore"/> @@ -200,7 +201,7 @@ - + @@ -242,10 +243,11 @@ - - + + + minOccurs="0" maxOccurs="1"/> @@ -269,7 +271,7 @@ + type="org.springframework.integration.file.remote.MessageSessionCallback"/> @@ -317,7 +319,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -332,7 +334,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -369,7 +371,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -417,7 +419,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -540,8 +542,8 @@ - - + + @@ -552,7 +554,7 @@ + maxOccurs="1"/> @@ -596,7 +598,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -615,7 +617,7 @@ ]]> - + @@ -630,19 +632,19 @@ - + - + + type="org.springframework.integration.file.remote.session.SessionFactory"/> + default="/"> Allows you to provide remote file/directory @@ -670,7 +672,7 @@ + type="xsd:string"> Specify a SpEL expression which 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 e51635dfca..77c8c378a1 100644 --- a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,22 @@ -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd -https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd -https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-3.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.3.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-3.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.3.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd +https\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd similarity index 93% rename from spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd rename to spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd index 6f26002c30..5a9e080dac 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire.xsd @@ -4,13 +4,13 @@ xmlns:tool="http://www.springframework.org/schema/tool" xmlns:integration="http://www.springframework.org/schema/integration" targetNamespace="http://www.springframework.org/schema/integration/gemfire" - elementFormDefault="qualified" attributeFormDefault="unqualified"> + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + @@ -183,11 +183,11 @@ - Identifies the channel to which error messages will be sent if a failure occurs in this - component's invocation. If no "error-channel" reference is provided, this component will - propagate Exceptions to the caller. To completely suppress Exceptions, provide a - reference to the "nullChannel" here. - + Identifies the channel to which error messages will be sent if a failure occurs in this + component's invocation. If no "error-channel" reference is provided, this component will + propagate Exceptions to the caller. To completely suppress Exceptions, provide a + reference to the "nullChannel" here. + 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 c3eb7cfd26..b9f6d1d65c 100644 --- a/spring-integration-groovy/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-groovy/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,24 @@ -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd -https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd -https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-3.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.3.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-3.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.3.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd +https\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy.xsd diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy.xsd similarity index 80% rename from spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd rename to spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy.xsd index c94fc1e1b8..64a4f080fe 100644 --- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd +++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy.xsd @@ -1,17 +1,17 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/groovy" + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd" + /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> @@ -33,7 +33,7 @@ + type="org.springframework.scripting.groovy.GroovyObjectCustomizer"/> @@ -46,7 +46,7 @@ - + @@ -57,7 +57,7 @@ + type="org.codehaus.groovy.control.CompilerConfiguration"/> @@ -78,12 +78,12 @@ - + maxOccurs="1"/> + + minOccurs="0" maxOccurs="1"/> - + @@ -92,7 +92,7 @@ + type="org.springframework.scripting.groovy.GroovyObjectCustomizer"/> 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 d4684e6de7..5da745408c 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,24 @@ -http\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd -https\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd -https\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-2.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-3.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-4.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-4.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-4.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-4.3.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-5.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-5.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-2.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-3.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-4.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-4.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-4.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-4.3.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-5.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-5.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd +https\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http.xsd diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http.xsd similarity index 94% rename from spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd rename to spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http.xsd index 4800232f50..67f8e52588 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http.xsd @@ -2,13 +2,12 @@ + targetNamespace="http://www.springframework.org/schema/integration/http" elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - Marks this endpoint as permitting cross origin requests (CORS). + Marks this endpoint as permitting cross origin requests (CORS). @@ -73,12 +72,13 @@ 'HttpStatus' value, or use a literal expression e.g. "201". By default 'status-code-expression' is null, meaning that the default '200 OK' response status will be returned. - The 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header of the reply + The 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header of the + reply Message. - + @@ -93,11 +93,12 @@ - + - Defines configuration for org.springframework.integration.http.inbound.RequestMapping + Defines configuration for + org.springframework.integration.http.inbound.RequestMapping as RESTFul attributes for Spring Integration HTTP Inbound Endpoints. @@ -107,10 +108,14 @@ - The producible media types of the mapped request, narrowing the primary mapping. - The format is a sequence of media types ("text/plain", "application/*), - with a request only mapped if the Accept matches one of these media types. - Expressions can be negated by using the "!" operator, as in "!text/plain", which matches + The producible media types of the mapped request, narrowing the + primary mapping. + The format is a sequence of media types ("text/plain", + "application/*), + with a request only mapped if the Accept matches one of these media + types. + Expressions can be negated by using the "!" operator, as in + "!text/plain", which matches all requests with a Accept other than "text/plain". @@ -139,7 +144,7 @@ - + @@ -147,7 +152,7 @@ - + @@ -162,7 +167,7 @@ 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 + 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. @@ -214,14 +219,16 @@ a 'reply-timeout'. The expression must return an object which can be converted to a 'org.springframework.http.HttpStatus' enum value. - The 'evaluationContext' has a 'BeanResolver' but no variables, so the usage of this attribute + The 'evaluationContext' has a 'BeanResolver' but no variables, so the usage of this + attribute is somewhat limited. An example might be to resolve, at runtime, some scoped Bean that returns an 'HttpStatus' value, or use a literal expression e.g. "504". By default 'status-code-expression' is null, meaning that the default '500 Internal Server Error' response status will be returned after a timeout. When a timeout is not encountered, - the 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header of the reply + the 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header + of the reply Message. @@ -248,7 +255,7 @@ - + @@ -329,7 +336,7 @@ - + @@ -353,7 +360,7 @@ - + @@ -366,7 +373,7 @@ - + @@ -394,7 +401,8 @@ - + @@ -419,7 +427,7 @@ - + @@ -444,15 +452,17 @@ - - + + - + @@ -523,7 +533,7 @@ - + @@ -602,13 +612,13 @@ - - - - - - - + + + + + + + @@ -618,12 +628,12 @@ Defines common configuration for gateway adapters. - + - + @@ -732,7 +742,7 @@ - + @@ -745,7 +755,7 @@ - + @@ -759,7 +769,7 @@ - + @@ -769,7 +779,7 @@ - + @@ -784,7 +794,7 @@ ]]> - + @@ -796,7 +806,7 @@ - + @@ -848,7 +858,7 @@ - + @@ -876,7 +886,7 @@ - + @@ -884,7 +894,8 @@ - SpEL expression to determine the type for the expected response to which the response body should be converted + SpEL expression to determine the type for the expected response to which the response body should be + converted The returned value of the expression could be an instance of java.lang.Class or java.lang.String representing a fully qualified class name. This attribute cannot be provided if expected-response-type has a value @@ -895,7 +906,7 @@ - + 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 8e8fb3deef..e97c1d08a9 100644 --- a/spring-integration-ip/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ip/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,24 @@ -http\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.2.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd -http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd -https\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.2.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd -https\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.1.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.2.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.1.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.2.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.3.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.1.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.2.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.1.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.2.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.1.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.2.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.3.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.0.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.1.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.2.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd +https\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip.xsd diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip.xsd similarity index 87% rename from spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd rename to spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip.xsd index c63ddf555a..96768d49c6 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip.xsd @@ -1,15 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/ip" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> Defines a Message Producing Endpoint for the - 'org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter' for receiving incoming udp packets. + 'org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter' for receiving incoming udp + packets. @@ -53,7 +54,7 @@ - + @@ -72,7 +73,7 @@ + minOccurs="0" maxOccurs="1"/> @@ -96,7 +97,7 @@ - + @@ -106,11 +107,11 @@ - - - - - + + + + + @@ -144,13 +145,13 @@ - + + type="org.springframework.integration.ip.tcp.connection.ConnectionFactory"/> @@ -169,7 +170,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -179,7 +180,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -192,7 +193,7 @@ + use="optional" default="false"> If set to true, causes the adapter to act as a client with respect @@ -204,8 +205,8 @@ - - + + @@ -220,15 +221,15 @@ + minOccurs="0" maxOccurs="1"/> - + + type="org.springframework.integration.ip.tcp.connection.ConnectionFactory"/> @@ -247,7 +248,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -261,7 +262,7 @@ + use="optional" default="false"> If set to true, causes the adapter to establish a connection when @@ -272,8 +273,8 @@ - - + + @@ -286,13 +287,13 @@ - + + type="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory"/> @@ -302,12 +303,12 @@ + use="required"> + type="org.springframework.messaging.MessageChannel"/> @@ -317,18 +318,18 @@ + type="org.springframework.messaging.MessageChannel"/> - + + type="org.springframework.messaging.MessageChannel"/> @@ -346,7 +347,7 @@ + use="optional" default="false"> If set to true, causes the gateway to act as a client with respect @@ -358,8 +359,8 @@ - - + + @@ -374,17 +375,17 @@ - + + minOccurs="0" maxOccurs="1"/> - + + type="org.springframework.integration.ip.tcp.connection.ConnectionFactory"/> @@ -398,7 +399,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -408,7 +409,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -487,7 +488,7 @@ - + @@ -498,7 +499,7 @@ - + @@ -511,8 +512,8 @@ - - + + @@ -535,7 +536,7 @@ + default="false"> If true, the factory will use java.nio.channel.SocketChannel for @@ -546,13 +547,13 @@ - - - - - - - + + + + + + + @@ -586,7 +587,7 @@ + type="org.springframework.core.serializer.Serializer"/> @@ -604,7 +605,7 @@ + type="org.springframework.core.serializer.Deserializer"/> @@ -663,13 +664,13 @@ + type="org.springframework.integration.ip.tcp.connection.TcpConnectionInterceptorFactoryChain"/> + default="false"> When set to "true", adds sequenceNumber and correlationId headers to @@ -697,7 +698,7 @@ + type="org.springframework.integration.ip.tcp.connection.TcpSSLContextSupport"/> @@ -721,7 +722,7 @@ + type="org.springframework.integration.ip.tcp.connection.TcpSocketSupport"/> @@ -741,7 +742,7 @@ + type="org.springframework.integration.ip.tcp.connection.TcpSocketFactorySupport"/> @@ -758,7 +759,7 @@ + type="org.springframework.integration.ip.tcp.connection.TcpNioConnectionSupport"/> @@ -772,7 +773,7 @@ + type="org.springframework.integration.ip.tcp.connection.TcpNetConnectionSupport"/> @@ -787,7 +788,7 @@ + type="org.springframework.integration.ip.tcp.connection.TcpMessageMapper"/> @@ -826,8 +827,8 @@ - - + + @@ -860,18 +861,18 @@ - - + + - - - - - + + + + + @@ -893,7 +894,7 @@ + use="optional" default="60000"> When in client mode, specifies the retry interval, in milliseconds, if @@ -914,7 +915,7 @@ - + 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 5df8bebc77..ffc27114c4 100644 --- a/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,24 @@ -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd -https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd -https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-3.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.3.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-3.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.3.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd +https\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd similarity index 91% rename from spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd rename to spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd index f26c5d1b50..b8b83d62d5 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc.xsd @@ -1,13 +1,15 @@ + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/jdbc" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + @@ -50,7 +52,7 @@ specified (but not both). - + @@ -86,7 +88,7 @@ ]]> - + @@ -99,7 +101,7 @@ ]]> - + @@ -111,7 +113,7 @@ ]]> - + @@ -145,7 +147,7 @@ - + @@ -200,7 +202,8 @@ an in clause from the properties "id" of the input list elements. - + @@ -214,12 +217,14 @@ placeholders (e.g. "SELECT * from FOO where KEY=:key") they will be bound from this source by name. Note: if you use the framework's 'ExpressionEvaluatingSqlParameterSourceFactory' - to create a SpEL-based parameter source, be sure to use the 'createParameterSourceNoCache' + to create a SpEL-based parameter source, be sure to use the + 'createParameterSourceNoCache' method so that the expression will be re-evaluated on each poll. See the reference documentation for more information. - + @@ -242,7 +247,8 @@ - + @@ -257,7 +263,8 @@ This attribute is mutually exclusive with the 'prepared-statement-setter'. - + @@ -270,7 +277,8 @@ This attribute is mutually exclusive with the 'sql-parameter-source-factory'. - + @@ -312,9 +320,9 @@ 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 + 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 + a select query and a row-mapper is provided. If the update count is returned then the map key is "UPDATE". @@ -344,7 +352,8 @@ - + @@ -390,7 +399,8 @@ This attribute is mutually exclusive with the 'request-prepared-statement-setter'. - + @@ -400,10 +410,12 @@ Reference to a MessagePreparedStatementSetter. - This attribute is mutually exclusive with the 'request-sql-parameter-source-factory'. + This attribute is mutually exclusive with the + 'request-sql-parameter-source-factory'. - + @@ -419,39 +431,40 @@ parameters like :payload and :headers[foo]. - + - - The receiving Message Channel of this endpoint. - + + The receiving Message Channel of this endpoint. + - + - - Message Channel to which replies should be sent, - after receiving the database response. - + + Message Channel to which replies should be sent, + after receiving the database response. + - + - - + - + - 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 + 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. @@ -517,7 +531,7 @@ - + @@ -530,7 +544,7 @@ data-source must be specified (but not both). - + @@ -588,7 +602,7 @@ Others require a custom row mapper. - + @@ -607,9 +621,9 @@ - + + maxOccurs="unbounded" type="sqlParameterDefinitionType"> + type="parameterSubElementType"> - + - - + + type="xsd:string"> Reference to a SqlParameterSourceFactory. - + @@ -706,7 +721,7 @@ to be executed. - + @@ -734,9 +749,9 @@ - + + maxOccurs="unbounded" type="sqlParameterDefinitionType"> + type="parameterSubElementType"> + maxOccurs="unbounded" type="returningResultSetRowMappersType"> - + @@ -819,7 +835,7 @@ - + @@ -833,7 +849,7 @@ parameters like :payload and :headers[foo]. - + @@ -847,12 +863,12 @@ - + - - + - - - - - + + + + + @@ -900,7 +916,7 @@ - + @@ -910,7 +926,7 @@ - + @@ -923,7 +939,7 @@ - + @@ -967,7 +983,7 @@ - + @@ -992,9 +1008,9 @@ - + + maxOccurs="unbounded" type="sqlParameterDefinitionType"> + type="parameterSubElementType"> + maxOccurs="unbounded" type="returningResultSetRowMappersType"> - + @@ -1080,7 +1096,7 @@ - + @@ -1111,7 +1127,7 @@ - + @@ -1122,7 +1138,7 @@ - + @@ -1134,7 +1150,7 @@ - + @@ -1185,10 +1201,10 @@ - + - + Reference to a data source to use to access @@ -1196,7 +1212,7 @@ - + @@ -1212,7 +1228,7 @@ - + @@ -1253,30 +1269,30 @@ - + - - - - - Reference to a row mapper to use to convert - JDBC result set rows to message payloads. - - - - - - - + + + + + Reference to a row mapper to use to convert + JDBC result set rows to message payloads. + + + + + + + - + - - + - + 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 64a37809ea..f53e6f653e 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,24 @@ -http\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.2.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd -https\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.2.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd -https\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.1.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.2.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-3.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.2.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.3.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.1.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.2.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.1.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.2.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-3.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.2.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.3.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.0.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.1.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.2.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd +https\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms.xsd diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms.xsd similarity index 73% rename from spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd rename to spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms.xsd index 9fc409a6ef..68dc96644f 100644 --- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd +++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms.xsd @@ -1,17 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/jms" + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - Reference to a JMS Queue. Either this attribute or the 'queue-name' - must be provided, but only one. + 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. + 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. + Name of a JMS Queue to be resolved by this channel's DestinationResolver. @@ -70,22 +68,22 @@ - Reference to a JMS Topic. Either this attribute or the 'topic-name' - must be provided, but only one. + 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. + Name of a JMS Topic to be resolved by this channel's DestinationResolver. - Boolean value indicating whether the Topic subscription is durable. + Boolean value indicating whether the Topic subscription is durable. @@ -106,11 +104,14 @@ - Boolean property indicating whether to make the subscription shared. The shared subscription name to be used can be - specified through the 'subscription' attribute. Default is "false". Set this to "true" to register a shared - subscription. - Note that shared subscriptions may also be durable, so this flag can - (and often will) be combined with 'durable' as well. Requires a JMS 2.0 compatible message broker. + Boolean property indicating whether to make the subscription shared. The shared + subscription name to be used can be + specified through the 'subscription' attribute. Default is "false". Set this to "true" + to register a shared + subscription. + Note that shared subscriptions may also be durable, so this flag can + (and often will) be combined with 'durable' as well. Requires a JMS 2.0 compatible + message broker. @@ -143,15 +144,15 @@ - ID for this channel. Required. + ID for this channel. Required. - Reference to a JMS ConnectionFactory. If none is provided, the default - bean name for the reference will be "jmsConnectionFactory". + Reference to a JMS ConnectionFactory. If none is provided, the default + bean name for the reference will be "jmsConnectionFactory". @@ -209,8 +210,8 @@ - Timeout for the container's consumers if message-driven is TRUE, or - timeout for receive calls on the template if message-driven is FALSE. + Timeout for the container's consumers if message-driven is TRUE, or + timeout for receive calls on the template if message-driven is FALSE. @@ -327,26 +328,26 @@ - Specify a boolean value indicating whether the delivery mode should be - DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify a boolean value indicating whether the delivery mode should be + DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). + This setting will only take effect if 'explicit-qos-enabled' is true. - Specify the message time to live. - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify the message time to live. + This setting will only take effect if 'explicit-qos-enabled' is true. - Specify the default priority of the message. Overridden by the message priority - header, if present; range 0-9. - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify the default priority of the message. Overridden by the message priority + header, if present; range 0-9. + This setting will only take effect if 'explicit-qos-enabled' is true. @@ -358,8 +359,8 @@ ]]> - - + + @@ -376,9 +377,9 @@ - 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). + 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). @@ -391,53 +392,69 @@ - The boolean property used to configure the listener container with knowledge of what JMS domain is being used. - Unless 'subscription-shared' or 'subscription-durable' is true, by default the value of this property is 'false' , - indicating that the point-to-point domain, Queues, will be used. When true, the pub/sub domain, Topics, will - be used. + The boolean property used to configure the listener container with knowledge of what JMS + domain is being used. + Unless 'subscription-shared' or 'subscription-durable' is true, by default the value of + this property is 'false' , + indicating that the point-to-point domain, Queues, will be used. When true, the pub/sub + domain, Topics, will + be used. - 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). + 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). - Boolean property indicating whether to make the subscription shared. The shared subscription name to be used can be - specified through the 'subscription-name' attribute. Default is "false". Set this to "true" to register a shared - subscription, typically in combination with a 'subscription-name' value (unless your message listener class name is - good enough as subscription name). Note that shared subscriptions may also be durable, so this flag can - (and often will) be combined with 'subscription-durable' as well. - Only makes sense when listening to a topic (pub-sub domain), therefore this automatically sets - 'pub-sub-domain' to 'true'. Requires a JMS 2.0 compatible message broker. + Boolean property indicating whether to make the subscription shared. The shared + subscription name to be used can be + specified through the 'subscription-name' attribute. Default is "false". Set this to + "true" to register a shared + subscription, typically in combination with a 'subscription-name' value (unless your + message listener class name is + good enough as subscription name). Note that shared subscriptions may also be durable, + so this flag can + (and often will) be combined with 'subscription-durable' as well. + Only makes sense when listening to a topic (pub-sub domain), therefore this + automatically sets + 'pub-sub-domain' to 'true'. Requires a JMS 2.0 compatible message broker. - The name of a subscription to create. To be applied in case of a topic (pub-sub domain) with a shared or durable - subscription. The 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 the message listener container) is allowed for each - subscription, except for a shared subscription (which requires JMS 2.0). + The name of a subscription to create. To be applied in case of a topic (pub-sub domain) + with a shared or durable + subscription. The 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 the message listener + container) is allowed for each + subscription, except for a shared subscription (which requires JMS 2.0). - 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. + 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. @@ -494,7 +511,8 @@ - + @@ -526,9 +544,9 @@ - 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). + 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). @@ -561,8 +579,8 @@ - Timeout for receive calls on the template. - NOTE: for JmsTemplate, 0 means indefinite while -1 means no-wait. + Timeout for receive calls on the template. + NOTE: for JmsTemplate, 0 means indefinite while -1 means no-wait. @@ -602,9 +620,9 @@ - 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 'request-destination-name' and 'request-pub-sub-domain' which will rely + upon the DestinationResolver strategy (DynamicDestinationResolver by default). @@ -618,9 +636,9 @@ - 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). + 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). @@ -653,7 +671,8 @@ - Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to JMS Message. + Allows to specify custom implementation of JmsHeaderMapper to map Message Headers to + JMS Message. @@ -702,7 +721,8 @@ - + @@ -710,43 +730,56 @@ - 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). + 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). - Boolean property indicating whether to make the subscription shared. The shared subscription name to be used can be - specified through the 'subscription-name' attribute. Default is "false". Set this to "true" to register a shared - subscription, typically in combination with a 'subscription-name' value (unless your message listener class name is - good enough as subscription name). Note that shared subscriptions may also be durable, so this flag can - (and often will) be combined with 'subscription-durable' as well. - Only makes sense when listening to a topic (pub-sub domain), therefore this automatically sets - 'request-pub-sub-domain' to 'true'. Requires a JMS 2.0 compatible message broker. + Boolean property indicating whether to make the subscription shared. The shared + subscription name to be used can be + specified through the 'subscription-name' attribute. Default is "false". Set this to + "true" to register a shared + subscription, typically in combination with a 'subscription-name' value (unless your + message listener class name is + good enough as subscription name). Note that shared subscriptions may also be durable, + so this flag can + (and often will) be combined with 'subscription-durable' as well. + Only makes sense when listening to a topic (pub-sub domain), therefore this + automatically sets + 'request-pub-sub-domain' to 'true'. Requires a JMS 2.0 compatible message broker. - The name of a subscription to create. To be applied in case of a topic (pub-sub domain) with a shared or durable - subscription. The 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 the message listener container) is allowed for each - subscription, except for a shared subscription (which requires JMS 2.0). + The name of a subscription to create. To be applied in case of a topic (pub-sub domain) + with a shared or durable + subscription. The 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 the message listener + container) is allowed for each + subscription, except for a shared subscription (which requires JMS 2.0). - 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. + 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. @@ -773,10 +806,10 @@ - - + + + minOccurs="0" maxOccurs="1"/> - + @@ -837,7 +870,7 @@ - Timeout for the JMS MessageConsumer to receive the JMS reply Message. Default is 5 seconds. + Timeout for the JMS MessageConsumer to receive the JMS reply Message. Default is 5 seconds. @@ -867,11 +900,11 @@ - 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'. + 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'. @@ -883,40 +916,42 @@ - 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'. + 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'. + 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 a 'request-destination' reference or - a 'request-destination-expression' that evaluates to a destination), - a true value here specifies that the DestinationResolver should resolve Topics rather than Queues. - Default is false. + When resolving a request destination name (rather than a 'request-destination' reference or + a 'request-destination-expression' that evaluates to a destination), + 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). - This attribute is mutually exclusive with - 'reply-destination-name' and 'reply-destination-expression'. + 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). + This attribute is mutually exclusive with + 'reply-destination-name' and 'reply-destination-expression'. @@ -928,30 +963,32 @@ - Name of a destination which will be used for the replyTo header. This name will be handled - by this gateway's DestinationResolver. This attribute is mutually exclusive with - 'reply-destination' and 'reply-destination-expression'. + Name of a destination which will be used for the replyTo header. This name will be handled + by this gateway's DestinationResolver. This attribute is mutually exclusive with + 'reply-destination' and 'reply-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 - together with the reply-pub-sub-domain attribute. - This attribute is mutually exclusive with 'reply-destination' and 'reply-destination-name'. + 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 + together with the reply-pub-sub-domain attribute. + This attribute is mutually exclusive with 'reply-destination' and 'reply-destination-name'. - When resolving a reply destination name (rather than a 'reply-destination' reference or - a 'reply-destination-expression' that evaluates to a destination), - a true value here specifies that the DestinationResolver should resolve Topics rather than Queues. - Default is false. + When resolving a reply destination name (rather than a 'reply-destination' reference or + a 'reply-destination-expression' that evaluates to a destination), + a true value here specifies that the DestinationResolver should resolve Topics rather than + Queues. + Default is false. @@ -1020,8 +1057,9 @@ - A reference to an implementation of JmsHeaderMapper to map Message Headers to JMS Message. Default - is a 'DefaultJmsHeaderMapper'. + A reference to an implementation of JmsHeaderMapper to map Message Headers to JMS Message. + Default + is a 'DefaultJmsHeaderMapper'. @@ -1029,47 +1067,47 @@ - When 'true' (default), this attribute indicates that the JMS Message body will be created - (by the MessageConverter) from the Spring Integration Message's payload. - When 'false', the entire Spring Integration Message will be converted to the JMS Message body. - In both cases, the message headers will be mapped to JMS headers/properties by the HeaderMapper. + When 'true' (default), this attribute indicates that the JMS Message body will be created + (by the MessageConverter) from the Spring Integration Message's payload. + When 'false', the entire Spring Integration Message will be converted to the JMS Message body. + In both cases, the message headers will be mapped to JMS headers/properties by the HeaderMapper. - When 'true' (default), this attribute indicates that the payload of the Spring Integration - reply message will be created from the 'JMS Message' body (by the MessageConverter). - When 'false', the Spring Integration Message payload will be the entire JMS Message. - In both cases, the JMS Message headers/properties will be mapped to message headers - by the HeaderMapper. + When 'true' (default), this attribute indicates that the payload of the Spring Integration + reply message will be created from the 'JMS Message' body (by the MessageConverter). + When 'false', the Spring Integration Message payload will be the entire JMS Message. + In both cases, the JMS Message headers/properties will be mapped to message headers + by the HeaderMapper. - Specify a boolean value indicating whether the delivery mode should be - DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify a boolean value indicating whether the delivery mode should be + DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). + This setting will only take effect if 'explicit-qos-enabled' is true. - Specify the message time to live. - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify the message time to live. + This setting will only take effect if 'explicit-qos-enabled' is true. - Specify the default priority of the message. Overridden by the message priority - header, if present; range 0-9 - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify the default priority of the message. Overridden by the message priority + header, if present; range 0-9 + This setting will only take effect if 'explicit-qos-enabled' is true. @@ -1135,15 +1173,15 @@ + minOccurs="0" maxOccurs="1"/> - 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'. + 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'. @@ -1155,27 +1193,32 @@ - 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'. + 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'. + 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. + If true, specifies that destination names should resolve to Topics rather than Queues. + Default is false. @@ -1210,26 +1253,26 @@ - Specify a boolean value indicating whether the delivery mode should be - DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify a boolean value indicating whether the delivery mode should be + DeliveryMode.PERSISTENT (true) or DeliveryMode.NON_PERSISTENT (false). + This setting will only take effect if 'explicit-qos-enabled' is true. - Specify the message time to live. - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify the message time to live. + This setting will only take effect if 'explicit-qos-enabled' is true. - Specify the default priority of the message. Overridden by the message priority - header, if present; range 0-9. - This setting will only take effect if 'explicit-qos-enabled' is true. + Specify the default priority of the message. Overridden by the message priority + header, if present; range 0-9. + This setting will only take effect if 'explicit-qos-enabled' is true. @@ -1274,7 +1317,8 @@ A SpEL expression to be evaluated at runtime against each Spring Integration Message as - the root object. The result should be a long representing the time-to-live for the message. + the root object. The result should be a long representing the time-to-live for the + message. If returns null, falls back to the 'time-to-live' or default. The 'explicit-qos-enabled' has to be enabled. Note: the static time-to-live value can be specified on the JmsTemplate. @@ -1289,7 +1333,7 @@ - Common configuration for message-driven inbound JMS-based adapters. + Common configuration for message-driven inbound JMS-based adapters. @@ -1303,7 +1347,8 @@ ]]> - + @@ -1319,7 +1364,8 @@ - + @@ -1331,7 +1377,7 @@ - Common configuration for inbound JMS-based adapters. + Common configuration for inbound JMS-based adapters. @@ -1355,7 +1401,7 @@ - A JMS Message Selector expression. + A JMS Message Selector expression. @@ -1367,7 +1413,8 @@ - Defines a 'org.springframework.integration.transformer.HeaderEnricher' for adding statically configured JMS Headers. + Defines a 'org.springframework.integration.transformer.HeaderEnricher' for adding statically + configured JMS Headers. @@ -1376,14 +1423,14 @@ - The ReplyTo Destination for the JMS Message. + The ReplyTo Destination for the JMS Message. - The Correlation ID for the JMS Message. + The Correlation ID for the JMS Message. @@ -1392,9 +1439,12 @@ - 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 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. @@ -1409,18 +1459,19 @@ - - + + - + - Boolean value to indicate whether this header value should overwrite an existing header value for the same name. + Boolean value to indicate whether this header value should overwrite an existing header value for + the same name. @@ -1432,7 +1483,7 @@ - Common configuration for JMS-based adapters. + Common configuration for JMS-based adapters. @@ -1456,7 +1507,7 @@ - @@ -1497,48 +1548,48 @@ 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 + 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 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 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. + 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 @@ -1549,16 +1600,16 @@ - Interval in milliseconds between the recovery attempts + Interval in milliseconds 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 + 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. @@ -1568,7 +1619,7 @@ - Specify the limit for idle executions of a consumer task, not having + 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 @@ -1591,13 +1642,13 @@ - - + + - - + + diff --git a/spring-integration-jmx/src/main/resources/META-INF/spring.schemas b/spring-integration-jmx/src/main/resources/META-INF/spring.schemas index cf05c1d9b2..d1dce8dbee 100644 --- a/spring-integration-jmx/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jmx/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,24 @@ -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd -https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd -https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-3.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.3.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-3.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.3.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd +https\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx.xsd diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx.xsd similarity index 84% rename from spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd rename to spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx.xsd index a94603ebb8..bb21b1ef80 100644 --- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd +++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx.xsd @@ -1,14 +1,15 @@ + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/jmx" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + - + @@ -46,15 +47,15 @@ - - - + + + + type="org.springframework.integration.jmx.MBeanObjectConverter"/> @@ -79,13 +80,14 @@ - - + + + minOccurs="0" maxOccurs="1"/> - - + + @@ -112,11 +114,11 @@ - + + minOccurs="0" maxOccurs="1"/> - + @@ -136,9 +138,9 @@ - - - + + + @@ -156,11 +158,11 @@ - + + minOccurs="0" maxOccurs="1"/> - + @@ -187,11 +189,11 @@ - + - Static object properties to be used for this domain. These properties are appended to + Static object properties to be used for this domain. These properties are appended to the ObjectName of all MBeans registered by this component. @@ -199,10 +201,14 @@ - Comma separated list of simple patterns for component names to register (defaults to '*'). - The pattern is applied to all components before they are registered, looking for a match on - the 'name' property of the ObjectName. A MessageChannel and a MessageHandler (for instance) - can share a name because they have a different type, so in that case they would either both + Comma separated list of simple patterns for component names to register (defaults to + '*'). + The pattern is applied to all components before they are registered, looking for a match + on + the 'name' property of the ObjectName. A MessageChannel and a MessageHandler (for + instance) + can share a name because they have a different type, so in that case they would either + both be included or both excluded. Since version 4.2, a leading '!' negates the pattern match ('!foo*' means don't export components where the name matches the pattern 'foo*'). For components with names that match multiple patterns, the first pattern wins. @@ -213,11 +219,13 @@ - + - An ObjectNamingStrategy to generate the MBean's ObjectName. See the reference documentation + An ObjectNamingStrategy to generate the MBean's ObjectName. See the reference + documentation for details of the default ObjectName. Also see 'object-name-static-properties'. @@ -235,7 +243,7 @@ - + @@ -247,7 +255,7 @@ - A reference to an ObjectName instance. If this + A reference to an ObjectName instance. If this attribute is specified you cannot specify `query-name`. @@ -260,7 +268,7 @@ - A string to be parsed into a QueryExp object. If this + A string to be parsed into a QueryExp object. If this attribute is specified you cannot specify `query-expression-ref`. @@ -268,7 +276,7 @@ - A reference to a QueryExp instance. If this + A reference to a QueryExp instance. If this attribute is specified you cannot specify `query-expression`. @@ -285,7 +293,7 @@ - + @@ -303,8 +311,8 @@ - - + + @@ -318,19 +326,19 @@ - - + + - + Defines the name of the MBeanServer bean to connect to. - + diff --git a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas index a94e5f7c36..d601ab394e 100644 --- a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,20 @@ -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd -https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd -https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-2.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-3.0.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.0.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.1.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.3.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.0.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.1.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-2.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-3.0.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.0.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.1.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.3.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.0.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.1.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd +https\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa.xsd diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa.xsd similarity index 84% rename from spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd rename to spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa.xsd index b2cab5e4c8..ab932233bb 100644 --- a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd +++ b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa.xsd @@ -1,15 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/jpa" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + @@ -44,7 +44,7 @@ + type="org.springframework.integration.jpa.support.parametersource.ParameterSource"/> @@ -53,7 +53,7 @@ - + - - - Configures a Consumer Endpoint for the - 'org.springframework.integration.jpa.outbound.JpaOutboundGatewayFactoryBean' (one-way) - updating a database using the Java Persistence API (JPA). - - - - - - - - - - + + Configures a Consumer Endpoint for the + 'org.springframework.integration.jpa.outbound.JpaOutboundGatewayFactoryBean' (one-way) + updating a database using the Java Persistence API (JPA). + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - Reference to a ParameterSourceFactory. - Mutually exclusive with the 'parameter' sub-element(s). - - - - - - - - - - - - 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. + Reference to a ParameterSourceFactory. + Mutually exclusive with the 'parameter' sub-element(s). - - - + + + + + + + + + + + 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. + + + + @@ -179,8 +181,8 @@ - - + + @@ -195,9 +197,10 @@ - + - + @@ -213,8 +216,8 @@ - - + + @@ -229,7 +232,8 @@ - + @@ -267,9 +271,9 @@ - + - + @@ -316,7 +320,7 @@ - - + @@ -345,7 +349,7 @@ - + @@ -358,7 +362,7 @@ - + @@ -391,7 +395,7 @@ + type="org.springframework.integration.jpa.support.parametersource.ParameterSourceFactory"/> @@ -481,14 +485,14 @@ - - - Specifies the expression for the maximum number of entities that shall be returned - by a JPA Operation. Using this attribute sets - the 'maxResults' property of the JPA Query object. This attribute is mutually - exclusive with the 'max-results' attribute. - - + + + Specifies the expression for the maximum number of entities that shall be returned + by a JPA Operation. Using this attribute sets + the 'maxResults' property of the JPA Query object. This attribute is mutually + exclusive with the 'max-results' attribute. + + @@ -510,7 +514,7 @@ - + @@ -526,7 +530,7 @@ - + @@ -541,13 +545,14 @@ - + - Specifies whether EntityManager.flush() should be called after performing 'deletes' for retrieved entities. + Specifies whether EntityManager.flush() should be called after performing 'deletes' for retrieved + entities. Applies only if 'delete-after-poll = true'. Defaults to 'false'. @@ -578,15 +583,15 @@ - + - + - - + - + - + @@ -630,7 +635,7 @@ - + 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 f9f117a566..22ceef8ade 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,24 @@ -http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd -https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd -https\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-3.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.3.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-3.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.3.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd +https\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail.xsd similarity index 80% rename from spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd rename to spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail.xsd index 033f49e479..2bc156b0ff 100644 --- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd +++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail.xsd @@ -1,17 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/mail" + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + @@ -93,15 +92,19 @@ + type="org.springframework.integration.mail.SearchTermStrategy"/> - Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy + Reference to a custom implementation of + org.springframework.integration.mail.SearchTermStrategy to use when retrieving email. Only permitted with 'imap' protocol or an 'imap' uri. - By default, the ImapMailReceiver will search for Messages based on the default SearchTerm - which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not - been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)". + By default, the ImapMailReceiver will search for Messages based on the default + SearchTerm + which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT + DELETED, that are NOT SEEN and have not + been processed by this mail receiver (enabled by the use of the custom USER flag or + simply NOT FLAGGED if not supported)". @@ -121,15 +124,16 @@ - - - + + + + type="org.springframework.messaging.MessageChannel"/> @@ -144,15 +148,19 @@ + type="org.springframework.integration.mail.SearchTermStrategy"/> - Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy + Reference to a custom implementation of + org.springframework.integration.mail.SearchTermStrategy to use when retrieving email. - By default, the ImapMailReceiver will search for Messages based on the default SearchTerm - which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not - been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)". + By default, the ImapMailReceiver will search for Messages based on the default + SearchTerm + which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT + DELETED, that are NOT SEEN and have not + been processed by this mail receiver (enabled by the use of the custom USER flag or + simply NOT FLAGGED if not supported)". @@ -166,7 +174,7 @@ ]]> - + @@ -205,8 +213,8 @@ - Specify the javax.mail.Session reference. - NOTE: if this is provided, then 'java-mail-properties' should not be. + Specify the javax.mail.Session reference. + NOTE: if this is provided, then 'java-mail-properties' should not be. @@ -218,8 +226,8 @@ - Reference to a 'java.util.Properties' instance with settings for the JavaMail Session. - NOTE: if this is provided, then 'session' 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. @@ -231,8 +239,8 @@ - Specify the javax.mail.Authenticator. - 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. @@ -280,20 +288,20 @@ - When 'true', messages produced by the source will be rendered by 'MimeMessage.getContent()' - which is usually just the body for a simple text email. When false (default) the content - is rendered by the 'getContent()' method on the actual message returned by the underlying - javamail implementation. - For example, an IMAP message is rendered with some message headers. - This attribute is provided so that users can enable the previous behavior, which just - rendered the body. + When 'true', messages produced by the source will be rendered by 'MimeMessage.getContent()' + which is usually just the body for a simple text email. When false (default) the content + is rendered by the 'getContent()' method on the actual message returned by the underlying + javamail implementation. + For example, an IMAP message is rendered with some message headers. + This attribute is provided so that users can enable the previous behavior, which just + rendered the body. - + @@ -340,9 +348,12 @@ - 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 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. @@ -355,13 +366,14 @@ - - - + + + - Boolean value to indicate whether this header value should overwrite an existing header value for the same name. + Boolean value to indicate whether this header value should overwrite an existing header value for + the same name. @@ -405,7 +417,7 @@ ]]> - + @@ -413,11 +425,11 @@ - When a 'header-mapper' is provided, and the 'MimeMessage' has embedded 'Part' (e.g. 'Message' or - 'Multipart') contents, the message payload will be a byte[] containing the raw data. Set this - boolean to 'false' for the payload to be a decoded 'Part' object. Note that 'Part's are not - 'Serializable', nor are they suitable for serialization using other technologies such as Kryo. - Default 'true' (payload is 'byte[]'). + When a 'header-mapper' is provided, and the 'MimeMessage' has embedded 'Part' (e.g. 'Message' or + 'Multipart') contents, the message payload will be a byte[] containing the raw data. Set this + boolean to 'false' for the payload to be a decoded 'Part' object. Note that 'Part's are not + 'Serializable', nor are they suitable for serialization using other technologies such as Kryo. + Default 'true' (payload is 'byte[]'). diff --git a/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas b/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas index 510ef262b5..89fba33983 100644 --- a/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,20 @@ -http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd -http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd -https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd -https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-3.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.3.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-3.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.3.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd +https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd diff --git a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd similarity index 92% rename from spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd rename to spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd index 1d90c0b433..40bc619222 100644 --- a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd +++ b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd @@ -4,11 +4,11 @@ xmlns:tool="http://www.springframework.org/schema/tool" xmlns:integration="http://www.springframework.org/schema/integration" targetNamespace="http://www.springframework.org/schema/integration/mongodb" - elementFormDefault="qualified" attributeFormDefault="unqualified"> + elementFormDefault="qualified"> - + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + @@ -45,8 +45,10 @@ - SpEL expression which should resolve to a String query (please refer to the 'query' attribute), - or to an instance of MongoDb Query (e.q., query-expression="new BasicQuery('{''name'' : ''Bob''}').limit(2)"). + SpEL expression which should resolve to a String query (please refer to the 'query' + attribute), + or to an instance of MongoDb Query (e.q., query-expression="new BasicQuery('{''name'' : + ''Bob''}').limit(2)"). This attribute is mutually exclusive with 'query' attribute. @@ -60,7 +62,7 @@ If this attribute is not provided the default value is com.mongodb.DBObject - + @@ -68,11 +70,16 @@ - Allows you to manage find* method of MongoTemplate is used to query MongoDb. Default value for this - attribute is 'false'. This means that we'll use find(..) method thus resulting in a Message with - payload of type List of entities identified by 'entity-class' attribute. If you want/expect a single - value set this attribute to 'true' which will result in invocation of findOne(..) method resulting in - the payload of type identified by 'entity-class' attribute (default com.mongodb.DBObject) + Allows you to manage find* method of MongoTemplate is used to query MongoDb. Default + value for this + attribute is 'false'. This means that we'll use find(..) method thus resulting in a + Message with + payload of type List of entities identified by 'entity-class' attribute. If you + want/expect a single + value set this attribute to 'true' which will result in invocation of findOne(..) method + resulting in + the payload of type identified by 'entity-class' attribute (default + com.mongodb.DBObject) @@ -95,7 +102,7 @@ + minOccurs="0" maxOccurs="1"/> @@ -119,7 +126,7 @@ + minOccurs="0"/> @@ -129,7 +136,7 @@ - + @@ -141,7 +148,7 @@ - + @@ -178,7 +185,7 @@ - + @@ -201,7 +208,7 @@ - + @@ -234,7 +241,7 @@ If this attribute is not provided the default value is org.bson.Document - + @@ -251,7 +258,7 @@ + type="org.springframework.data.mongodb.core.CollectionCallback"/> @@ -276,7 +283,7 @@ org.springframework.data.mongodb.MongoDbFactory - + @@ -289,7 +296,7 @@ org.springframework.data.mongodb.core.MongoTemplate - + @@ -321,7 +328,7 @@ + type="org.springframework.data.mongodb.core.convert.MongoConverter"/> diff --git a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas index 2f85466ebd..4421d6b7d9 100644 --- a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,16 @@ -http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.2.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd -http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd -https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.2.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd -https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.0.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.1.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.2.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.3.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.0.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.1.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.2.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.0.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.1.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.2.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.3.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.0.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.1.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.2.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd +https\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd similarity index 56% rename from spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd rename to spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd index 5d9a8d461c..06b6a57473 100644 --- a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd +++ b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt.xsd @@ -1,15 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/mqtt" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + @@ -93,113 +93,113 @@ - + + + Configures a Consumer Endpoint for the + 'org.springframework.integration.mqtt.outbound.MqttPahoMessageDrivenChannelAdapter' + that sends messages to the MQTT topic. + + + + + + + + + + + + + Channel from which messages will be output. + When a message is sent to this channel it will + cause the query + to be executed. + + + + + + + + + - Configures a Consumer Endpoint for the - 'org.springframework.integration.mqtt.outbound.MqttPahoMessageDrivenChannelAdapter' - that sends messages to the MQTT topic. + Specifies the order for invocation when this endpoint is connected as a + subscriber to a SubscribableChannel. - - - - - - - - - - - - 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. - - - - - - - Specifies the default topic to which messages will be sent. Required if - the 'topic-expression' evaluates to 'null' - - - - - - - Specifies an expression to evaluate to determine the destination topic. - Default "headers['mqtt_topic']". - - - - - - - Specifies the default quality of service; used if the 'qos-expression' - evaluates to 'null'. Default 0. - - - - - - - Specifies an expression to evaluate to determine the message qos. - Default "headers['mqtt_qos']". - - - - - - - Specifies the default value of the 'retained' flag; used if the - 'retained-expression' evaluates to 'null'. Default false. - - - - - - - Specifies an expression to evaluate to determine the message 'retained' - flag. Default "headers['mqtt_retained']". - - - - - - - Specifies that sends should not block, with the thread returning - immediately the message is sent. When 'true', message - sent and message delivery events can be published; see 'async-events'. - Default: 'false'. - - - - - - - When 'async' is true, specifies that message - sent and message delivery events will be published for reception - by a suitably configured 'ApplicationListener' or an event - inbound-channel-adapter. - Default: 'false'. - - - - + + + + + + Specifies the default topic to which messages will be sent. Required if + the 'topic-expression' evaluates to 'null' + + + + + + + Specifies an expression to evaluate to determine the destination topic. + Default "headers['mqtt_topic']". + + + + + + + Specifies the default quality of service; used if the 'qos-expression' + evaluates to 'null'. Default 0. + + + + + + + Specifies an expression to evaluate to determine the message qos. + Default "headers['mqtt_qos']". + + + + + + + Specifies the default value of the 'retained' flag; used if the + 'retained-expression' evaluates to 'null'. Default false. + + + + + + + Specifies an expression to evaluate to determine the message 'retained' + flag. Default "headers['mqtt_retained']". + + + + + + + Specifies that sends should not block, with the thread returning + immediately the message is sent. When 'true', message + sent and message delivery events can be published; see 'async-events'. + Default: 'false'. + + + + + + + When 'async' is true, specifies that message + sent and message delivery events will be published for reception + by a suitably configured 'ApplicationListener' or an event + inbound-channel-adapter. + Default: 'false'. + + + + @@ -221,7 +221,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -257,7 +257,7 @@ a paho MqttMessage. Default is DefaultMqttMessageConverter. ]]> - + @@ -270,7 +270,7 @@ override the defaults. Default is DefaultMqttClientFactory. ]]> - + 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 cb5e99b814..0656ea0abd 100644 --- a/spring-integration-redis/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-redis/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,22 @@ -http\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.2.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd -http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd -https\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.2.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd -https\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.1.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.2.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-3.0.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.0.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.1.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.2.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.3.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.0.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.1.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.2.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.1.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.2.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-3.0.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.0.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.1.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.2.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.3.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.0.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.1.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.2.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd +https\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis.xsd diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis.xsd similarity index 85% rename from spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd rename to spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis.xsd index 0894475602..b2723adecf 100644 --- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd +++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis.xsd @@ -1,14 +1,14 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/redis" + elementFormDefault="qualified"> - + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - Defines a 'org.springframework.integration.redis.channel.SubscribableRedisChannel' that is backed by a Redis topic. + Defines a 'org.springframework.integration.redis.channel.SubscribableRedisChannel' that is backed by a + Redis topic. @@ -28,7 +29,7 @@ - Name of the Redis topic that backs this channel. + Name of the Redis topic that backs this channel. @@ -61,15 +62,15 @@ - ID for this channel. Required. + ID for this channel. Required. - Reference to a RedisConnectionFactory. If none is provided, the default - bean name for the reference will be "redisConnectionFactory". + Reference to a RedisConnectionFactory. If none is provided, the default + bean name for the reference will be "redisConnectionFactory". @@ -116,7 +117,7 @@ - + @@ -132,12 +133,13 @@ - Reference to a RedisConnectionFactory. If none is provided, the default - bean name for the reference will be "redisConnectionFactory". + Reference to a RedisConnectionFactory. If none is provided, the default + bean name for the reference will be "redisConnectionFactory". - + @@ -145,14 +147,14 @@ - Redis topic names as a comma-delimited list of Strings. + Redis topic names as a comma-delimited list of Strings. - Redis topic patterns as a comma-delimited list of Strings. + Redis topic patterns as a comma-delimited list of Strings. @@ -164,7 +166,8 @@ ]]> - + @@ -183,9 +186,10 @@ - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer. - This attribute can be an empty string, which results in 'null' being used by the underlying adapter, - meaning no serializer is used and the raw byte[] will be the message payload. + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer. + This attribute can be an empty string, which results in 'null' being used by the underlying + adapter, + meaning no serializer is used and the raw byte[] will be the message payload. @@ -223,7 +227,7 @@ + minOccurs="0" maxOccurs="1"/> @@ -249,7 +253,8 @@ ]]> - + @@ -266,10 +271,12 @@ - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + Reference to an instance of + org.springframework.data.redis.serializer.RedisSerializer - + @@ -319,15 +326,15 @@ - + + minOccurs="0" maxOccurs="1"/> - RedisTemplate to be used with this adapter + RedisTemplate to be used with this adapter @@ -373,12 +380,15 @@ - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer. - It can be specified as an empty String value, which means the Endpoint's 'serializer' property is + Reference to an instance of + org.springframework.data.redis.serializer.RedisSerializer. + It can be specified as an empty String value, which means the Endpoint's + 'serializer' property is set to 'null', in which case the Message will contain the raw byte[] payload. - + @@ -415,7 +425,8 @@ - When 'false', specifies that data is read using a 'left pop' operation instead of a 'right pop'. + When 'false', specifies that data is read using a 'left pop' operation instead of a + 'right pop'. Default is 'true'. @@ -578,7 +589,7 @@ - + @@ -594,9 +605,9 @@ - + + minOccurs="0" maxOccurs="1"/> @@ -627,10 +638,12 @@ - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + Reference to an instance of + org.springframework.data.redis.serializer.RedisSerializer - + @@ -670,10 +683,10 @@ - - + + + minOccurs="0" maxOccurs="1"/> @@ -789,9 +802,9 @@ - + + minOccurs="0" maxOccurs="1"/> @@ -803,7 +816,8 @@ - + @@ -925,13 +939,16 @@ - Reference to an instance of org.springframework.integration.redis.outbound.ArgumentsStrategy. - Mutually exclusive with the 'argument-expressions' attribute. By default the 'payload' is used + Reference to an instance of + org.springframework.integration.redis.outbound.ArgumentsStrategy. + Mutually exclusive with the 'argument-expressions' attribute. By default the 'payload' is + used as the command argument(s). To disable any strategy (no arguments) this attribute should be configured as an empty string. - + @@ -942,7 +959,7 @@ - Common configuration for Redis adapters. + Common configuration for Redis adapters. @@ -959,110 +976,113 @@ - - - - - - - + + + + + + + RedisTemplate to be used with this adapter - - - - - - - - - - + + + + + + + + + + + + SpEL expression that returns the name of the key for the collection being used. If you want + to provide a + constant key, use the 'key' attribute. + This attribute is mutually exclusive with the 'key' attribute. + + + + + + + The name of the key for the collection being used. If you require a key to be dynamically + determined per each poll use 'key-expression' attribute. + This attribute is mutually exclusive with the 'key-expression' attribute. + + + + + + - SpEL expression that returns the name of the key for the collection being used. If you want to provide a - constant key, use the 'key' attribute. - This attribute is mutually exclusive with the 'key' attribute. + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + to serialize the 'key' value for this collection. Please refer to the JavaDoc of the + RedisTemplate + for more detail. - - - - + + + + + + + + + - The name of the key for the collection being used. If you require a key to be dynamically - determined per each poll use 'key-expression' attribute. - This attribute is mutually exclusive with the 'key-expression' attribute. + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer + to serialize the 'value' entered into the collection. Please refer to the JavaDoc of the + RedisTemplate + for more detail. - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - to serialize the 'key' value for this collection. Please refer to the JavaDoc of the RedisTemplate - for more detail. - - - - - - - - - - - - Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer - to serialize the 'value' entered into the collection. Please refer to the JavaDoc of the RedisTemplate - for more detail. - - - - - - - - - - - + + + + + + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer to be used when serializing hash keys (only relevant for hash-typed collections). Please refer to the JavaDoc of the RedisTemplate for more detail. - - - - - - - - - - - + + + + + + + + + + + Reference to an instance of org.springframework.data.redis.serializer.RedisSerializer to be used when serializing hash values (only relevant for hash-typed collections). Please refer to the JavaDoc of the RedisTemplate for more detail. - - - - - - - - - - - - Channel to which Error Messages will be sent. - - - - - - - - - + + + + + + + + + + + + Channel to which Error Messages will be sent. + + + + + + + + + @@ -1079,7 +1099,8 @@ - SpEL expression that returns the name of the key for the collection being used. If you want to provide a + SpEL expression that returns the name of the key for the collection being used. If you want to + provide a constant key, use the 'key' attribute. Default is the 'redis_key' message header. This attribute is mutually exclusive with the 'key' attribute. @@ -1104,11 +1125,14 @@ - If set to 'true' (Default) and the payload is an instance of a "multi-value" object (i.e., Collection or Map) - it will be stored using addAll/putAll semantics. Otherwise, if set to 'false' the payload will be stored - as single entry regardless of its type. - If the payload is not an instance of a "multi-value" object, the value of this attribute is ignored and - the payload will always be stored as a single entry. + If set to 'true' (Default) and the payload is an instance of a "multi-value" object (i.e., + Collection or Map) + it will be stored using addAll/putAll semantics. Otherwise, if set to 'false' the payload will be + stored + as single entry regardless of its type. + If the payload is not an instance of a "multi-value" object, the value of this attribute is ignored + and + the payload will always be stored as a single entry. 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 cce4c1f67b..e7b8a6443b 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,24 @@ -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd -https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd -https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-3.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.3.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-3.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.3.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd +https\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi.xsd diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi.xsd similarity index 87% rename from spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd rename to spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi.xsd index 3fd4926ece..cfc6095d04 100644 --- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd +++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi.xsd @@ -1,16 +1,16 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/rmi" + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + @@ -82,9 +83,10 @@ - + + minOccurs="0" maxOccurs="1"/> @@ -124,7 +126,8 @@ - + @@ -137,7 +140,7 @@ - Defines common configuration for gateway adapters. + Defines common configuration for gateway adapters. diff --git a/spring-integration-rsocket/src/main/resources/META-INF/spring.schemas b/spring-integration-rsocket/src/main/resources/META-INF/spring.schemas index 92b3e834ad..b0a97bad50 100644 --- a/spring-integration-rsocket/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-rsocket/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,4 @@ -http\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket-5.2.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket-5.2.xsd -http\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket-5.2.xsd -https\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket-5.2.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket-5.2.xsd -https\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket-5.2.xsd +http\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket-5.2.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket.xsd +http\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket.xsd +https\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket-5.2.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket.xsd +https\://www.springframework.org/schema/integration/rsocket/spring-integration-rsocket.xsd=org/springframework/integration/rsocket/config/spring-integration-rsocket.xsd diff --git a/spring-integration-rsocket/src/main/resources/org/springframework/integration/rsocket/config/spring-integration-rsocket-5.2.xsd b/spring-integration-rsocket/src/main/resources/org/springframework/integration/rsocket/config/spring-integration-rsocket.xsd similarity index 99% rename from spring-integration-rsocket/src/main/resources/org/springframework/integration/rsocket/config/spring-integration-rsocket-5.2.xsd rename to spring-integration-rsocket/src/main/resources/org/springframework/integration/rsocket/config/spring-integration-rsocket.xsd index 5f765b0e97..cbf18080c6 100644 --- a/spring-integration-rsocket/src/main/resources/org/springframework/integration/rsocket/config/spring-integration-rsocket-5.2.xsd +++ b/spring-integration-rsocket/src/main/resources/org/springframework/integration/rsocket/config/spring-integration-rsocket.xsd @@ -4,13 +4,12 @@ xmlns:tool="http://www.springframework.org/schema/tool" xmlns:integration="http://www.springframework.org/schema/integration" targetNamespace="http://www.springframework.org/schema/integration/rsocket" - elementFormDefault="qualified" - attributeFormDefault="unqualified"> + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> 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 f7d38bc82c..bcb38ff0b4 100644 --- a/spring-integration-scripting/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-scripting/src/main/resources/META-INF/spring.schemas @@ -1,9 +1,42 @@ -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd -https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd -https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd -https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd -https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd - +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd +https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd similarity index 77% rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd index 39e9d11976..3f3e5f1211 100644 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd @@ -1,14 +1,13 @@ + xmlns="http://www.springframework.org/schema/integration/scripting" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + elementFormDefault="qualified"> - + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> @@ -26,23 +25,23 @@ Name of the script variable. - + Value of the script variable as a literal. - + Value of the script variable as a bean reference. - + - + @@ -54,7 +53,7 @@ Resource location path for the Script. Either this or an inline script as body text should be provided, but not both. - + @@ -62,10 +61,10 @@ Reference to the ScriptVariableGenerator bean. This attribute is mutually exclusive with any 'variable' sub-elements and 'variables' attribute. - + + type="org.springframework.integration.scripting.ScriptVariableGenerator"/> @@ -75,7 +74,7 @@ Refresh delay for the script contents if specified as a resource location (defaults to -1, never refresh). - + diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting.xsd similarity index 70% rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting.xsd index fc5f2899f5..6dcca5758f 100644 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting.xsd @@ -1,11 +1,11 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://www.springframework.org/schema/integration/scripting" + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd"/> @@ -20,20 +20,20 @@ - + The script language or JSR 223 scripting engine name. Required only for inline scripts. If a script location is referenced, the language may be derived from the file extension (.rb: ruby, .groovy, js: javascript (ECMAScript), .py: python). - + - + The script variable to return as a result of the evaluation (Optional). - + 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 cd1a272cdb..e0b89e6134 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,24 @@ -http\://www.springframework.org/schema/integration/security/spring-integration-security-5.2.xsd=org/springframework/integration/security/config/spring-integration-security-5.2.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-5.2.xsd -https\://www.springframework.org/schema/integration/security/spring-integration-security-5.2.xsd=org/springframework/integration/security/config/spring-integration-security-5.2.xsd -https\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-5.2.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-2.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-2.1.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-2.2.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-3.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-4.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-4.1.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-4.2.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-4.3.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-5.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-5.1.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-5.2.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-2.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-2.1.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-2.2.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-3.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-4.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-4.1.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-4.2.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-4.3.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-5.0.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-5.1.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security-5.2.xsd=org/springframework/integration/security/config/spring-integration-security.xsd +https\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security.xsd diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.2.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security.xsd similarity index 75% rename from spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.2.xsd rename to spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security.xsd index 3eccba2450..42298f5cf5 100644 --- a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.2.xsd +++ b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security.xsd @@ -1,13 +1,12 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + targetNamespace="http://www.springframework.org/schema/integration/security" + elementFormDefault="qualified"> - - + + @@ -24,7 +23,8 @@ - + @@ -44,7 +44,8 @@ - Defines the security access policy for send and/or receive invocations based on a Message Channel name pattern. + Defines the security access policy for send and/or receive invocations based on a Message Channel name + pattern. 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 aaf019c2b3..a3f2b97fba 100644 --- a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,25 @@ -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd -https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd -https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-3.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.3.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-3.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.3.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd +https\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp.xsd diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp.xsd similarity index 92% rename from spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd rename to spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp.xsd index 7982ade06d..5e556e5ea2 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp.xsd @@ -1,41 +1,41 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + xmlns:int-file="http://www.springframework.org/schema/integration/file" + targetNamespace="http://www.springframework.org/schema/integration/sftp" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/file/spring-integration-file.xsd"/> - Configures a Consumer Endpoint for the + Configures a Consumer Endpoint for the 'org.springframework.integration.file.remote.handler.FileTransferringMessageHandler' for the 'SftpRemoteFileTemplate' that writes files to a remote SFTP endpoint. - + - + + minOccurs="0" maxOccurs="1"/> + type="org.springframework.messaging.MessageChannel"/> @@ -65,8 +65,8 @@ - - + + @@ -78,7 +78,7 @@ Configures a 'SourcePollingChannelAdapter' Endpoint for the 'org.springframework.integration.sftp.inbound.SftpInboundFileSynchronizingMessageSource' that synchronizes with a remote SFTP endpoint. - + @@ -112,7 +112,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -128,7 +128,7 @@ + use="required"> Identifies the directory path (e.g., @@ -138,7 +138,7 @@ + type="xsd:string"> Tells this adapter if the local directory must @@ -172,7 +172,7 @@ + type="org.springframework.integration.file.DirectoryScanner"/> @@ -185,7 +185,7 @@ + type="org.springframework.integration.metadata.MetadataStore"/> @@ -203,7 +203,7 @@ - + @@ -244,10 +244,11 @@ - - + + + minOccurs="0" maxOccurs="1"/> @@ -264,7 +265,7 @@ + type="org.springframework.integration.file.remote.MessageSessionCallback"/> @@ -312,7 +313,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -326,7 +327,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -363,7 +364,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -411,7 +412,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -532,8 +533,8 @@ - - + + @@ -544,7 +545,7 @@ + maxOccurs="1"/> @@ -588,7 +589,7 @@ + type="org.springframework.integration.file.filters.FileListFilter"/> @@ -607,7 +608,7 @@ ]]> - + @@ -622,19 +623,19 @@ - + - + + type="org.springframework.integration.file.remote.session.SessionFactory"/> + default="/"> Allows you to provide remote file/directory @@ -662,7 +663,7 @@ + type="xsd:string"> Specify a SpEL expression which diff --git a/spring-integration-stomp/src/main/resources/META-INF/spring.schemas b/spring-integration-stomp/src/main/resources/META-INF/spring.schemas index 5421080895..edc50e8f22 100644 --- a/spring-integration-stomp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-stomp/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,12 @@ -http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd -http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd -https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd -https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd - +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-4.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-4.3.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.0.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.1.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-4.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-4.3.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.0.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.1.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd +https\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp.xsd diff --git a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp.xsd similarity index 98% rename from spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd rename to spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp.xsd index 5acaea46f7..f6b31c9044 100644 --- a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd +++ b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp.xsd @@ -4,13 +4,12 @@ xmlns:tool="http://www.springframework.org/schema/tool" xmlns:integration="http://www.springframework.org/schema/integration" targetNamespace="http://www.springframework.org/schema/integration/stomp" - elementFormDefault="qualified" - attributeFormDefault="unqualified"> + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/stream" + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - + + minOccurs="0" maxOccurs="1"/> diff --git a/spring-integration-syslog/src/main/resources/META-INF/spring.schemas b/spring-integration-syslog/src/main/resources/META-INF/spring.schemas index c109b2068b..128dd331ca 100644 --- a/spring-integration-syslog/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-syslog/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,18 @@ -http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.2.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd -http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd -https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.2.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd -https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd - +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-3.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.1.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.2.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.3.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.1.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.2.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-3.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.1.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.2.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.3.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.1.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.2.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd +https\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog.xsd diff --git a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog.xsd similarity index 79% rename from spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd rename to spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog.xsd index 7d87e349ea..9af1485ec4 100644 --- a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd +++ b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog.xsd @@ -1,18 +1,18 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + xmlns:int-ip="http://www.springframework.org/schema/integration/ip" + targetNamespace="http://www.springframework.org/schema/integration/syslog" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd"/> - + - + + type="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory"/> @@ -55,7 +55,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -65,7 +65,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -78,7 +78,7 @@ + default="udp"> The protocol used to listen for syslog packets, 'udp' or 'tcp'. @@ -103,7 +103,7 @@ + type="org.springframework.integration.syslog.MessageConverter"/> @@ -114,7 +114,7 @@ + use="optional"> A timeout (milliseconds) when sending messages to 'channel' or @@ -125,7 +125,7 @@ - + diff --git a/spring-integration-webflux/src/main/resources/META-INF/spring.schemas b/spring-integration-webflux/src/main/resources/META-INF/spring.schemas index 991f57c7d5..808d9b59de 100644 --- a/spring-integration-webflux/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-webflux/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,8 @@ -http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.2.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd -http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd -https\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.2.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd -https\://www.springframework.org/schema/integration/webflux/spring-integration-webflux.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd +http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.0.xsd=/org/springframework/integration/webflux/config/spring-integration-webflux.xsd +http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.1.xsd=/org/springframework/integration/webflux/config/spring-integration-webflux.xsd +http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.2.xsd=/org/springframework/integration/webflux/config/spring-integration-webflux.xsd +http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux.xsd=org/springframework/integration/webflux/config/spring-integration-webflux.xsd +https\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.0.xsd=/org/springframework/integration/webflux/config/spring-integration-webflux.xsd +https\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.1.xsd=/org/springframework/integration/webflux/config/spring-integration-webflux.xsd +https\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.2.xsd=/org/springframework/integration/webflux/config/spring-integration-webflux.xsd +https\://www.springframework.org/schema/integration/webflux/spring-integration-webflux.xsd=org/springframework/integration/webflux/config/spring-integration-webflux.xsd diff --git a/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd b/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux.xsd similarity index 95% rename from spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd rename to spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux.xsd index 5a76ebb1d4..ee4def54c2 100644 --- a/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd +++ b/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux.xsd @@ -4,15 +4,14 @@ xmlns:tool="http://www.springframework.org/schema/tool" xmlns:integration="http://www.springframework.org/schema/integration" xmlns:int-http="http://www.springframework.org/schema/integration/http" - targetNamespace="http://www.springframework.org/schema/integration/webflux" elementFormDefault="qualified" - attributeFormDefault="unqualified"> + targetNamespace="http://www.springframework.org/schema/integration/webflux" elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/http/spring-integration-http.xsd"/> - + @@ -102,7 +102,8 @@ - Defines configuration for org.springframework.integration.http.inbound.RequestMapping + Defines configuration for + org.springframework.integration.http.inbound.RequestMapping as RESTFul attributes for Spring Integration HTTP Inbound Endpoints. @@ -112,10 +113,14 @@ - The producible media types of the mapped request, narrowing the primary mapping. - The format is a sequence of media types ("text/plain", "application/*), - with a request only mapped if the Accept matches one of these media types. - Expressions can be negated by using the "!" operator, as in "!text/plain", which matches + The producible media types of the mapped request, narrowing the + primary mapping. + The format is a sequence of media types ("text/plain", + "application/*), + with a request only mapped if the Accept matches one of these media + types. + Expressions can be negated by using the "!" operator, as in + "!text/plain", which matches all requests with a Accept other than "text/plain". @@ -144,7 +149,7 @@ - + @@ -152,7 +157,7 @@ - + @@ -199,14 +204,16 @@ a 'reply-timeout'. The expression must return an object which can be converted to a 'org.springframework.http.HttpStatus' enum value. - The 'evaluationContext' has a 'BeanResolver' but no variables, so the usage of this attribute + The 'evaluationContext' has a 'BeanResolver' but no variables, so the usage of this + attribute is somewhat limited. An example might be to resolve, at runtime, some scoped Bean that returns an 'HttpStatus' value, or use a literal expression e.g. "504". By default 'status-code-expression' is null, meaning that the default '500 Internal Server Error' response status will be returned after a timeout. When a timeout is not encountered, - the 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header of the reply + the 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header + of the reply Message. @@ -233,7 +240,7 @@ - + @@ -254,7 +261,7 @@ - + @@ -278,7 +285,7 @@ - + @@ -291,7 +298,7 @@ - + @@ -304,7 +311,8 @@ - + @@ -318,7 +326,7 @@ - + @@ -331,7 +339,7 @@ - + @@ -396,7 +404,7 @@ - + @@ -556,7 +564,7 @@ - + @@ -564,9 +572,11 @@ - SpEL expression to determine the type for a request 'Publisher' elements against a request + SpEL expression to determine the type for a request 'Publisher' elements against a + request message. The returned value of the expression could be an instance of java.lang.Class, - or java.lang.String representing a fully qualified class name, or 'ParameterizedTypeReference'. + or java.lang.String representing a fully qualified class name, or + 'ParameterizedTypeReference'. This attribute cannot be provided if 'publisher-element-type' has a value diff --git a/spring-integration-websocket/src/main/resources/META-INF/spring.schemas b/spring-integration-websocket/src/main/resources/META-INF/spring.schemas index 67b67d00f5..ce443a1b39 100644 --- a/spring-integration-websocket/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-websocket/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,14 @@ -http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.2.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd -http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd -https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.2.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd -https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-4.1.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-4.2.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-4.3.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.0.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.1.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.2.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-4.1.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-4.2.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-4.3.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.0.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.1.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.2.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd +https\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket.xsd diff --git a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.xsd similarity index 98% rename from spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd rename to spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.xsd index ad2febb74a..6f739885d0 100644 --- a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd +++ b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.xsd @@ -5,13 +5,12 @@ xmlns:tool="http://www.springframework.org/schema/tool" xmlns:integration="http://www.springframework.org/schema/integration" targetNamespace="http://www.springframework.org/schema/integration/websocket" - elementFormDefault="qualified" - attributeFormDefault="unqualified"> + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> + default="https://d1fxtkz8shb9d2.cloudfront.net/sockjs-0.3.4.min.js"> Transports with no native cross-domain communication (e.g. "eventsource", @@ -292,7 +291,8 @@ - List of 'org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory' bean references. + List of 'org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory' bean + references. Configure one or more factories to decorate the handler used to process WebSocket messages. This may be useful for some advanced use cases, for example to allow Spring Security to forcibly close the WebSocket session when the corresponding 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 be86e58ab3..c0ffcb9519 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,24 @@ -http\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.2.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd -https\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.2.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd -https\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.1.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.2.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-3.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.1.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.2.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.3.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.1.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.2.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.1.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.2.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-3.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.1.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.2.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.3.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.0.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.1.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.2.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd +https\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws.xsd diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws.xsd similarity index 85% rename from spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd rename to spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws.xsd index 8e24cabff5..ee2e44f749 100644 --- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd +++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws.xsd @@ -1,17 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/ws" + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - - - + + + - A unique identifier for this Gateway. + A unique identifier for this Gateway. - The channel where Messages should be sent to invoke the Web Service. + The channel where Messages should be sent to invoke the Web Service. @@ -56,9 +55,9 @@ - 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. + 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. @@ -134,27 +133,28 @@ - + - + - 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 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 Marshaller. If the Marshaller instance also implements - the Unmarshaller interface, then the 'unmarshaller' attribute is not required. + Reference to a Spring OXM Marshaller. If the Marshaller instance also implements + the Unmarshaller interface, then the 'unmarshaller' attribute is not required. @@ -166,7 +166,7 @@ - Reference to a Spring OXM Unmarshaller. + Reference to a Spring OXM Unmarshaller. @@ -188,7 +188,7 @@ - Reference to a Spring Web Services SourceExtractor. + Reference to a Spring Web Services SourceExtractor. @@ -200,9 +200,9 @@ - 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 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. @@ -255,7 +255,8 @@ - + @@ -372,8 +373,9 @@ this list can also be simple patterns to be matched against the header names (e. - 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. + 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. @@ -460,7 +462,8 @@ this list can also be simple patterns to be matched against the header names (e. - Defines a 'org.springframework.integration.transformer.HeaderEnricher' for adding a SOAP Action value. + Defines a 'org.springframework.integration.transformer.HeaderEnricher' for adding a SOAP Action + value. @@ -472,9 +475,12 @@ this list can also be simple patterns to be matched against the header names (e. - 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 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. @@ -487,13 +493,14 @@ this list can also be simple patterns to be matched against the header names (e. - - - + + + - Boolean value to indicate whether this header value should overwrite an existing header value for the same name. + Boolean value to indicate whether this header value should overwrite an existing header value for + the same name. 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 bb43936d03..4877021201 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,24 @@ -http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd -https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd -https\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-3.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.3.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-3.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.3.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd +https\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml.xsd similarity index 84% rename from spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd rename to spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml.xsd index 9478bfae8a..b24e7dc783 100644 --- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd +++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml.xsd @@ -1,20 +1,20 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/xml" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - Defines the configuration elements for Spring Integration's XML support. + Defines the configuration elements for Spring Integration's XML support. @@ -25,12 +25,12 @@ marshalling transformer. - + + minOccurs="0"/> @@ -41,25 +41,27 @@ - + - + - + - + - + @@ -67,8 +69,9 @@ - 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". + 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". @@ -89,7 +92,7 @@ + minOccurs="0"/> @@ -116,8 +119,8 @@ - - + - + + minOccurs="0"/> @@ -187,7 +190,8 @@ ]]> - + @@ -201,7 +205,8 @@ ]]> - + @@ -238,7 +243,8 @@ ]]> - + @@ -274,21 +280,22 @@ + minOccurs="0"/> - 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. + 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. + 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. @@ -300,7 +307,8 @@ - The result type expected from the XPath evaluation. This will be the payload type of the output Message. + The result type expected from the XPath evaluation. This will be the payload type of the + output Message. @@ -310,9 +318,11 @@ - 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. + 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. @@ -324,12 +334,13 @@ - 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. + 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. @@ -356,31 +367,35 @@ + minOccurs="0"/> - 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 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. + 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. - + @@ -407,27 +422,28 @@ - Defines an XPath expression to be configured within an <xpath-header-enricher/> element. + Defines an XPath expression to be configured within an <xpath-header-enricher/> element. - The name of the header to be enriched. + 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 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 XPath Expression reference. Either this or 'xpath-expression' must be provided, but not both. @@ -439,7 +455,7 @@ - The result type expected from the XPath evaluation. This will be the type of the header value. + The result type expected from the XPath evaluation. This will be the type of the header value. @@ -449,12 +465,12 @@ - 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. + 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. - + @@ -471,9 +487,9 @@ - - - + + - + - + @@ -512,8 +528,8 @@ - - + + - + - - - + minOccurs="0"/> + + + Specify the Converter to use when converting payloads prior to XPath evaluation. @@ -595,7 +612,8 @@ ]]> - + - + @@ -747,9 +765,9 @@ - + + minOccurs="0"/> @@ -777,7 +795,7 @@ - + @@ -791,7 +809,7 @@ - + @@ -817,18 +835,19 @@ - + - + - The channel where the splitter will send the messages that return an empty container from + The channel where the splitter will send the messages that return an empty container + from split function. @@ -856,7 +875,7 @@ - + @@ -868,7 +887,7 @@ - + @@ -887,12 +906,12 @@ - Base type for XML filters. + Base type for XML filters. - + @@ -902,7 +921,7 @@ - + @@ -920,9 +939,9 @@ - - - + + + @@ -934,18 +953,18 @@ - - - - - + + + + + - - + + 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 fb6890a9fc..95b84596e3 100644 --- a/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,24 @@ -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd -https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd -https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-3.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.3.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-3.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.3.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd +https\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd similarity index 78% rename from spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd rename to spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd index c9f4ba2432..714493e307 100644 --- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd +++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd @@ -1,17 +1,15 @@ + elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> @@ -53,8 +51,8 @@ - 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 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 @@ -72,7 +70,7 @@ Dictates the policy for handling inbound messages from entries not already on the roster. Values can be "accept_all", "manual", "reject_all" or empty assuming 'null' to disable the Roster subscription altogether. - + @@ -201,87 +199,88 @@ - - - + + - - - - - - - - - - - Reference to XMPP connection bean - - - - - - - Allows you to reference custom implementation of HeaderMapper. - - - - - - + + + + + + + + + + Reference to XMPP connection bean + + + + + + + Allows you to reference custom implementation of HeaderMapper. + + + + + + - - + + - - - - - - - - - - - - - - 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. - - - - - - + + + + + + + + + + + + + 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. + + + + + + - - - + + + @@ -296,7 +295,7 @@ - The id of the user you sending a message to (e.g., user@gmail.com) + The id of the user you sending a message to (e.g., user@gmail.com) @@ -313,9 +312,12 @@ - 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 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. @@ -345,14 +347,15 @@ - SpEL expression 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. + Boolean value to indicate whether this header value should overwrite an existing header value for + the same name. @@ -371,7 +374,7 @@ - The receiving Message channel of this endpoint + The receiving Message channel of this endpoint @@ -383,7 +386,8 @@ - Identifies the Message channel where Message will be sent after it's being processed by this endpoint + Identifies the Message channel where Message will be sent after it's being processed by this + endpoint diff --git a/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas b/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas index 8d99972725..e9f9ada343 100644 --- a/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,12 @@ -http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.2.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd -http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd -https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.2.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd -https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-4.2.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-4.3.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.0.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.1.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.2.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-4.2.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-4.3.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.0.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.1.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.2.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd +https\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd diff --git a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd similarity index 74% rename from spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd rename to spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd index f766f2cc75..5ff36dd369 100644 --- a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd +++ b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper.xsd @@ -1,15 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" + targetNamespace="http://www.springframework.org/schema/integration/zookeeper" + elementFormDefault="qualified"> - - + + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> - - + + @@ -39,7 +39,7 @@ - + diff --git a/src/reference/asciidoc/changes-5.1-5.2.adoc b/src/reference/asciidoc/changes-5.1-5.2.adoc new file mode 100644 index 0000000000..84912820c8 --- /dev/null +++ b/src/reference/asciidoc/changes-5.1-5.2.adoc @@ -0,0 +1,159 @@ +[[migration-5.1-5.2]] +=== Changes between 5.1 and 5.2 + +[[x5.2-package-class]] +=== Package and Class Changes + +`Pausable` has been moved from `o.s.i.endpoint` to `o.s.i.core`. + +[[x5.2-behavior]] +=== Behavior Changes + +See the https://github.com/spring-projects/spring-integration/wiki/Spring-Integration-5.1-to-5.2-Migration-Guide[Migration Guide] about behavior changes in this version. + +[[x5.2-new-components]] +=== New Components + +[[x5.2-rsocket-support]] +==== RSocket Support + +The `spring-integration-rsocket` module is now available with channel adapter implementations for RSocket protocol support. +See <<./rsocket.adoc#rsocket,RSocket Support>> for more information. + +[[x5.2-rate-limit-advice]] +==== Rate Limit Advice Support + +The `RateLimiterRequestHandlerAdvice` is now available for limiting requests rate on handlers. +See <<./handler-advice.adoc#rate-limiter-advice,Rate Limiter Advice>> for more information. + +[[x5.2-cache-advice]] +==== Caching Advice Support + +The `CacheRequestHandlerAdvice` is now available for caching request results on handlers. +See <<./handler-advice.adoc#cache-advice,Caching Advice>> for more information. + +[[x5.2-kotlin-scripts]] +==== Kotlin Scripts Support + +The JSR223 scripting module now includes a support for Kotlin scripts. +See <<./scripting.adoc#scripting,Scripting Support>> for more information. + +[[x5.2-flux-aggregator]] +==== Flux Aggregator Support + +The `FluxAggregatorMessageHandler` is now available for grouping and windowing messages logic based on the Project Reactor `Flux` operators. +See <<./aggregator.adoc#flux-aggregator,Flux Aggregator>> for more information. + +[[x5.2-sftp-events]] +==== FTP/SFTP Event Publisher + +The FTP and SFTP modules now provide an event listener for certain Apache Mina FTP/SFTP server events. +See <<./ftp.adoc#ftp-server-events, Apache Mina FTP Server Events>> and <<./sftp.adoc#sftp-server-events, Apache Mina SFTP Server Events>> for more information. + +[[x5.2-avro]] +==== Avro Transformers + +Simple Apache Avro transformers are now provided. +See <<./transformers.adoc#avro-transformers, Avro Transformers>> for more information. + +[[x5.2-general]] +=== General Changes + +The `JsonToObjectTransformer` now supports generics for the target object to deserialize into. +See <<./transformer.adoc#json-transformers,JSON Transformers>> for more information. + +The `splitter` now supports a `discardChannel` configuration option. +See <<./splitter.adoc#splitter,Splitter>> for more information. + +The Control Bus can now handle `Pausable` (extension of `Lifecycle`) operations. +See <<./control-bus.adoc#control-bus,Control Bus>> for more information. + +The `Function>` strategy has been introduced for the aggregator component to merge and compute headers for output messages. +See <<./aggregator.adoc#aggregator-api,Aggregator Programming Model>> for more information. + +All the `MessageHandlingException` s thrown in the framework, includes now a bean resource and source for back tracking a configuration part in case no end-user code involved. +See <<./error-handling.adoc#error-handling,Error Handling>> for more information. + +For better end-user experience, Java DSL now provides a configurer variant for starting flow with a gateway interface. +See `IntegrationFlows.from(Class serviceInterface, Consumer endpointConfigurer)` JavaDocs for more information. +Also a `MethodArgsHolder` is now a root object for evaluation context for all the expressions in the `GatewayProxyFactoryBean`. +The `#args` and `#method` evaluation context variables are now deprecated. +See <<./gateway.adoc#gateway,Messaging Gateways>> for more information. + +[[x5.2-amqp]] +==== AMQP Changes + +The outbound endpoints can now be configured to synthesize a "nack" if no publisher confirm is received within a timeout. +See <<./amqp.adoc#amqp-outbound-endpoints,Outbound Channel Adapter>> for more information. + +The inbound channel adapter can now receive batched messages as a `List` payload instead of receiving a discrete message for each batch fragment. +See <<./amqp.adoc#amqp-debatching,Batched Messages>> for more information. + +The outbound channel adapter can now be configured to block the calling thread until a publisher confirm (acknowledgment) is received. +See <<./amqp.adoc#amqp-outbound-channel-adapter,Outbound Channel Adapter>> for more information. + +[[x5.2-file]] +==== File Changes + +Some improvements to filtering remote files have been made. +See <<./file.adoc#remote-persistent-flf,Remote Persistent File List Filters>> for more information. + +[[x5.2-tcp]] +==== TCP Changes + +The length header used by the `ByteArrayLengthHeaderSerializer` can now include the length of the header in addition to the payload. +See <<./ip.adoc#tcp-codecs,Message Demarcation (Serializers and Deserializers)>> for more information. + +When using a `TcpNioServerConnectionFactory`, priority is now given to accepting new connections over reading from existing connections, but it is configurable. +See <<./ip.adoc#note-nio,About Non-blocking I/O (NIO)>> for more information. + +The outbound gateway has a new property `closeStreamAfterSend`; when used with a new connection for each request/reply it signals EOF to the server, without closing the connection. +This is useful for servers that use the EOF to signal end of message instead of some delimiter in the data. +See <<./ip.adoc#tcp-gateways, TCP Gateways>> for more information. + +The client connection factories now support `connectTimeout` which causes an exception to be thrown if the connection is not established in that time. +See <<./ip.adoc#tcp-connection-factory, TCP Connection Factories>> for more information. + +`SoftEndOfStreamException` is now a `RuntimeException` instead of extending `IOException`. + +[[x5.2-mail]] +==== Mail Changes + +The `AbstractMailReceiver` has now an `autoCloseFolder` option (`true` by default), to disable an automatic folder close after a fetch, but populate `IntegrationMessageHeaderAccessor.CLOSEABLE_RESOURCE` header instead for downstream interaction. +See <<./mail.adoc#mail-inbound,Mail-receiving Channel Adapter>> for more information. + +[[x5.2-http]] +==== HTTP Changes + +The HTTP inbound endpoint now support a request payload validation. +See <<./http.adoc#http,HTTP Support>> for more information. + +[[x5.2-webflux]] +==== WebFlux Changes + +The `WebFluxRequestExecutingMessageHandler` now supports a `Publisher`, `Resource` and `MultiValueMap` as a request message `payload`. +The `WebFluxInboundEndpoint` now supports a request payload validation. +See <<./webflux.adoc#webflux,WebFlux Support>> for more information. + +[[x5.2-mongodb]] +==== MongoDb Changes + +The `MongoDbMessageStore` can now be configured with custom converters. +See <<./mongodb.adoc#mongodb, MongoDB Support>> for more information. + +[[x5.2-routers]] +==== Router Changes + +You can now disable falling back to the channel key as the channel bean name. +See <<./router.adoc#dynamic-routers, Dynamic Routers>> for more information. + +[[x5.2--ftp-sftp]] +==== FTP/SFTP Changes + +The `RotatingServerAdvice` is decoupled now from the `RotationPolicy` and its `StandardRotationPolicy`. + +The remote file information, including host/port and directory are included now into message headers in the `AbstractInboundFileSynchronizingMessageSource` and `AbstractRemoteFileStreamingMessageSource` implementations. +Also this information is included into headers in the read operations results of the `AbstractRemoteFileOutboundGateway` implementations. +The FTP outbound endpoints now support `chmod` to change permissions on the uploaded file. +(SFTP already supported it since version 4.3). +See <<./ftp.adoc#ftp, FTP(S) Support>> and <<./sftp.adoc#sftp, SFTP Support>> for more information. diff --git a/src/reference/asciidoc/history.adoc b/src/reference/asciidoc/history.adoc index 3fe71f7bc1..d47164ea61 100644 --- a/src/reference/asciidoc/history.adoc +++ b/src/reference/asciidoc/history.adoc @@ -2,6 +2,8 @@ == Change History // BE SURE TO PRECEDE ALL include:: with a blank line - see https://github.com/asciidoctor/asciidoctor/issues/1297 +include::./changes-5.1-5.2.adoc[] + include::./changes-5.0-5.1.adoc[] include::./changes-4.3-5.0.adoc[] diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc index 4139965f6e..b2dcca40b3 100644 --- a/src/reference/asciidoc/whats-new.adoc +++ b/src/reference/asciidoc/whats-new.adoc @@ -2,171 +2,19 @@ = What's New? [[spring-integration-intro-new]] -For those who are already familiar with Spring Integration, this chapter provides a brief overview of the new features of version 5.2. +For those who are already familiar with Spring Integration, this chapter provides a brief overview of the new features of version 5.3. If you are interested in the changes and features that were introduced in earlier versions, see the <<./history.adoc#history,Change History>>. [[whats-new]] -== What's New in Spring Integration 5.2? +== What's New in Spring Integration 5.3? -If you are interested in more details, see the Issue Tracker tickets that were resolved as part of the 5.2 development process. +If you are interested in more details, see the Issue Tracker tickets that were resolved as part of the 5.3 development process. -Also see a new <<./reactive-streams.adoc#reactive-streams,Reactive Streams Support>> chapter in this documentation. - -[[x5.2-package-class]] -=== Package and Class Changes - -`Pausable` has been moved from `o.s.i.endpoint` to `o.s.i.core`. - -[[x5.2-behavior]] -=== Behavior Changes - -See the https://github.com/spring-projects/spring-integration/wiki/Spring-Integration-5.1-to-5.2-Migration-Guide[Migration Guide] about behavior changes in this version. - -[[x5.2-new-components]] +[[x5.3-new-components]] === New Components -[[x5.2-rsocket-support]] -==== RSocket Support - -The `spring-integration-rsocket` module is now available with channel adapter implementations for RSocket protocol support. -See <<./rsocket.adoc#rsocket,RSocket Support>> for more information. - -[[x5.2-rate-limit-advice]] -==== Rate Limit Advice Support - -The `RateLimiterRequestHandlerAdvice` is now available for limiting requests rate on handlers. -See <<./handler-advice.adoc#rate-limiter-advice,Rate Limiter Advice>> for more information. - -[[x5.2-cache-advice]] -==== Caching Advice Support - -The `CacheRequestHandlerAdvice` is now available for caching request results on handlers. -See <<./handler-advice.adoc#cache-advice,Caching Advice>> for more information. - -[[x5.2-kotlin-scripts]] -==== Kotlin Scripts Support - -The JSR223 scripting module now includes a support for Kotlin scripts. -See <<./scripting.adoc#scripting,Scripting Support>> for more information. - -[[x5.2-flux-aggregator]] -==== Flux Aggregator Support - -The `FluxAggregatorMessageHandler` is now available for grouping and windowing messages logic based on the Project Reactor `Flux` operators. -See <<./aggregator.adoc#flux-aggregator,Flux Aggregator>> for more information. - -[[x5.2-sftp-events]] -==== FTP/SFTP Event Publisher - -The FTP and SFTP modules now provide an event listener for certain Apache Mina FTP/SFTP server events. -See <<./ftp.adoc#ftp-server-events, Apache Mina FTP Server Events>> and <<./sftp.adoc#sftp-server-events, Apache Mina SFTP Server Events>> for more information. - -[[x5.2-avro]] -==== Avro Transformers - -Simple Apache Avro transformers are now provided. -See <<./transformers.adoc#avro-transformers, Avro Transformers>> for more information. - -[[x5.2-general]] +[[x5.3-general]] === General Changes -The `JsonToObjectTransformer` now supports generics for the target object to deserialize into. -See <<./transformer.adoc#json-transformers,JSON Transformers>> for more information. - -The `splitter` now supports a `discardChannel` configuration option. -See <<./splitter.adoc#splitter,Splitter>> for more information. - -The Control Bus can now handle `Pausable` (extension of `Lifecycle`) operations. -See <<./control-bus.adoc#control-bus,Control Bus>> for more information. - -The `Function>` strategy has been introduced for the aggregator component to merge and compute headers for output messages. -See <<./aggregator.adoc#aggregator-api,Aggregator Programming Model>> for more information. - -All the `MessageHandlingException` s thrown in the framework, includes now a bean resource and source for back tracking a configuration part in case no end-user code involved. -See <<./error-handling.adoc#error-handling,Error Handling>> for more information. - -For better end-user experience, Java DSL now provides a configurer variant for starting flow with a gateway interface. -See `IntegrationFlows.from(Class serviceInterface, Consumer endpointConfigurer)` JavaDocs for more information. -Also a `MethodArgsHolder` is now a root object for evaluation context for all the expressions in the `GatewayProxyFactoryBean`. -The `#args` and `#method` evaluation context variables are now deprecated. -See <<./gateway.adoc#gateway,Messaging Gateways>> for more information. - -[[x5.2-amqp]] -==== AMQP Changes - -The outbound endpoints can now be configured to synthesize a "nack" if no publisher confirm is received within a timeout. -See <<./amqp.adoc#amqp-outbound-endpoints,Outbound Channel Adapter>> for more information. - -The inbound channel adapter can now receive batched messages as a `List` payload instead of receiving a discrete message for each batch fragment. -See <<./amqp.adoc#amqp-debatching,Batched Messages>> for more information. - -The outbound channel adapter can now be configured to block the calling thread until a publisher confirm (acknowledgment) is received. -See <<./amqp.adoc#amqp-outbound-channel-adapter,Outbound Channel Adapter>> for more information. - -[[x5.2-file]] -==== File Changes - -Some improvements to filtering remote files have been made. -See <<./file.adoc#remote-persistent-flf,Remote Persistent File List Filters>> for more information. - -[[x5.2-tcp]] -==== TCP Changes - -The length header used by the `ByteArrayLengthHeaderSerializer` can now include the length of the header in addition to the payload. -See <<./ip.adoc#tcp-codecs,Message Demarcation (Serializers and Deserializers)>> for more information. - -When using a `TcpNioServerConnectionFactory`, priority is now given to accepting new connections over reading from existing connections, but it is configurable. -See <<./ip.adoc#note-nio,About Non-blocking I/O (NIO)>> for more information. - -The outbound gateway has a new property `closeStreamAfterSend`; when used with a new connection for each request/reply it signals EOF to the server, without closing the connection. -This is useful for servers that use the EOF to signal end of message instead of some delimiter in the data. -See <<./ip.adoc#tcp-gateways, TCP Gateways>> for more information. - -The client connection factories now support `connectTimeout` which causes an exception to be thrown if the connection is not established in that time. -See <<./ip.adoc#tcp-connection-factory, TCP Connection Factories>> for more information. - -`SoftEndOfStreamException` is now a `RuntimeException` instead of extending `IOException`. - -[[x5.2-mail]] -==== Mail Changes - -The `AbstractMailReceiver` has now an `autoCloseFolder` option (`true` by default), to disable an automatic folder close after a fetch, but populate `IntegrationMessageHeaderAccessor.CLOSEABLE_RESOURCE` header instead for downstream interaction. -See <<./mail.adoc#mail-inbound,Mail-receiving Channel Adapter>> for more information. - -[[x5.2-http]] -==== HTTP Changes - -The HTTP inbound endpoint now support a request payload validation. -See <<./http.adoc#http,HTTP Support>> for more information. - -[[x5.2-webflux]] -==== WebFlux Changes - -The `WebFluxRequestExecutingMessageHandler` now supports a `Publisher`, `Resource` and `MultiValueMap` as a request message `payload`. -The `WebFluxInboundEndpoint` now supports a request payload validation. -See <<./webflux.adoc#webflux,WebFlux Support>> for more information. - -[[x5.2-mongodb]] -==== MongoDb Changes - -The `MongoDbMessageStore` can now be configured with custom converters. -See <<./mongodb.adoc#mongodb, MongoDB Support>> for more information. - -[[x5.2-routers]] -==== Router Changes - -You can now disable falling back to the channel key as the channel bean name. -See <<./router.adoc#dynamic-routers, Dynamic Routers>> for more information. - -[[x5.2--ftp-sftp]] -==== FTP/SFTP Changes - -The `RotatingServerAdvice` is decoupled now from the `RotationPolicy` and its `StandardRotationPolicy`. - -The remote file information, including host/port and directory are included now into message headers in the `AbstractInboundFileSynchronizingMessageSource` and `AbstractRemoteFileStreamingMessageSource` implementations. -Also this information is included into headers in the read operations results of the `AbstractRemoteFileOutboundGateway` implementations. -The FTP outbound endpoints now support `chmod` to change permissions on the uploaded file. -(SFTP already supported it since version 4.3). -See <<./ftp.adoc#ftp, FTP(S) Support>> and <<./sftp.adoc#sftp, SFTP Support>> for more information.