fa4775e7752fa8df0c41ada0a79885979e70190b
5 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Gary Russell
|
e8843f3358 |
INT-3208 Create 4.0 Schemas
Update the spring.schemas files. Update the version in the abstract namespace parser. JIRA: https://jira.springsource.org/browse/INT-3208 The following is a diff showing changes between the 3.0 and 4.0 schemas... ./spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd ./spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" /> ./spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd ./spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd 10c10 < schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd" --- > schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" 13c13 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd 9c9 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd 9c9 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-3.0.xsd 8c8 < schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" /> ./spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-3.0.xsd ./spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" /> ./spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd" /> ./spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> |
||
|
Andy Wilkinson
|
28ab8394de |
Build on top of Spring 4's new messaging types
This commit updates Spring Integration to depend upon Spring 4, making use of the message types that have moved from Spring Integration into Spring's new spring-messaging module. The default message converter no longer supports conversion of a message that is null, throwing an IllegalArgumentException if an attempt is made to convert null. Furthermore, GenericMessagingTemplate does not support sending null, again throwing an IllegalArgumentException. Previously, MessagingTemplate had no-oped an attempt to send null. ConcurrentAggregatorTests and AggregatorTests both had a single test that was specifically testing the behaviour of an aggregator that returns null for its message. These tests have been removed. CorrelatingMessageHandlerTests have been updated to specify some additional behaviour for its mocks so that null messages are not returned. These are the only functional changes that have been made. All other changes are simply for moving to the repackaged and/or renamed types. In the move to being part of core Spring, a number of constants and header accessor methods have moved from MessageHeaders to MessageHeaderAccessor. This commit continues this pattern for the enterprise integration headers that are specific to Spring Integration. A new class, EiMessageHeaderAccessor, has been created. This class provides constants and methods for working with SI-specific headers. The main code and tests have been updated to use this new class. |
||
|
Artem Bilan
|
f3d3f4ee4b |
INT-2998: Channel Adapters' Lifecycle Refactoring
* Add XSD attributeGroup `smartLifeCycleAttributeGroup`
* Use it for all adapters tags
* Refactoring `AbstractChannelAdapterParser` hierarchy
* Refactoring some `MessageHandler`'s that should not have `autoStartup` & `phase`.
It is the responsibility of `AbstrctEndpoint`
* Polishing some tests according new logic
JIRA: https://jira.springsource.org/browse/INT-2998
INT-2998: Polishing
Polishing
- Reformat schemas where indentation changed
- Add SLC to the UDP inbound adapter
|
||
|
Gary Russell
|
d6776b4889 |
INT-3107 Fix TCP Syslog ApplicationEventPublisher
No publisher was injected if the default embedded connection factory was used. |
||
|
Gary Russell
|
7908655883 |
INT-2982 Add Syslog Inbound Channel Adapter
* Supports UDP/TCP syslog messages. * See docbook patch for more information. For reference see: https://jira.springsource.org/browse/INT-2982 |