Commit Graph

3858 Commits

Author SHA1 Message Date
Oleg Zhurakousky
d5cb033c60 INT-1456, removed spring-tx dependency from MessagingTemplate 2010-09-15 21:38:00 -04:00
Oleg Zhurakousky
d086d767ec Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-15 21:08:53 -04:00
Oleg Zhurakousky
7d2d8c28a3 INT-1455, modified documentation to reflect changes to the poller configuration, added section on advice-chains configuration for pollers 2010-09-15 21:08:38 -04:00
Mark Fisher
8d2b29da4d INT-1453 added support for File-typed payloads in XPath components 2010-09-15 14:24:12 -07:00
Oleg Zhurakousky
d9671c6cf1 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-15 14:59:59 -04:00
Oleg Zhurakousky
13d31b25a3 added documentation to message-publishing section regarding sync vs async publishing' 2010-09-15 14:59:39 -04:00
Iwein Fuld
d1eebf9371 INT-1339: removed mark message to keep MessageGroup interface immutable 2010-09-15 20:45:04 +02:00
Oleg Zhurakousky
d40ce03e85 removed accidently typed in comment in MPI 2010-09-15 13:53:27 -04:00
Oleg Zhurakousky
b2533c0788 INT-1431, added SimpleMessageProducingHandlerMonitor to maintain semantics of some MessageHandlers also being MessageProducers 2010-09-15 13:50:16 -04:00
Oleg Zhurakousky
d99739a6bf fixed the broken doc 2010-09-15 11:12:07 -04:00
Oleg Zhurakousky
2e18ed6b11 INT-1371, added test for advice chain within the chain with TX, made spring-tx an optional depenency in template.mf 2010-09-15 11:06:16 -04:00
Oleg Zhurakousky
1b87db30ba INT-1417, updated documentation showing how 'javaMailProperties' could be provided 2010-09-15 10:39:22 -04:00
Oleg Zhurakousky
65a2f2462a INT-1371, made spring-tx dependency optional 2010-09-15 10:26:07 -04:00
Dave Syer
b3bba292db Remove stderr reference 2010-09-15 08:03:01 +01:00
Dave Syer
2ca4a8f347 Ignore failing test (timing sensitive in CI) as temporary measure 2010-09-15 08:00:06 +01:00
Mark Fisher
45d266972f INT-1193 Added namespace support for JSON transformers 2010-09-14 17:47:51 -07:00
Mark Fisher
46c52f1b81 INT-1026 Added initial implementation of JSON transformers. 2010-09-14 17:31:12 -07:00
Iwein Fuld
2d5a9dde49 INT-1339: Added support for partial completion for disordered sequences.
- Added markMessageFromGroup to MessageGroup interface
- made ResequencingMessageGroupProcessor return the partial sequence that was processed
- removed obsolete test
- refactored CorrelatingMessageHandler to deal with the partially processed sequence properly

Still it is needed to remove the release-strategy attribute from the namespace to avoid confusion.
2010-09-14 16:58:48 +02:00
Iwein Fuld
4c193a217c INT-1339: Added testcases enforcing the desired behavior 2010-09-14 16:58:48 +02:00
Dave Syer
b024ece0fb Fix test (timeout was expected) 2010-09-14 08:33:41 +01:00
Dave Syer
1bef0f8c27 Ignore failing test and add TODO 2010-09-14 08:29:35 +01:00
Dave Syer
df9e8aafc2 Add exception for timeout - easier to read failure in test 2010-09-14 08:03:36 +01:00
Dave Syer
6233647a54 INT-1437: push sequence details into message builder
INT-1420: add javadocs
2010-09-14 07:43:51 +01:00
Mark Fisher
965b51d2a6 INT-1363 JmsOutboundChannelAdapterParser now allows a JmsTemplate reference along with a Destination or destinationName (but the latter 2 are still mutually exclusive) 2010-09-13 18:07:38 -04:00
Mark Fisher
bf0da16684 INT-1363 JmsDestinationPollingSource no longer extends from AbstractJmsTemplateBasedAdapter 2010-09-13 17:54:50 -04:00
Mark Fisher
44b6490cda INT-1363 JmsSendingMessageHandler no longer extends from AbstractJmsTemplateBasedAdapter 2010-09-13 17:30:27 -04:00
Mark Fisher
01cf5cfc18 INT-1363 separating Destination/destinationName from JmsTemplate configuration 2010-09-13 16:50:46 -04:00
Iwein Fuld
aae01dc3d5 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration
Conflicts:
	spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java
2010-09-13 22:12:35 +02:00
Iwein Fuld
95e1230238 QUALITY: Reorder code in AbstractMessageSplitter 2010-09-13 22:06:56 +02:00
Mark Fisher
eea658deae Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-13 16:03:28 -04:00
Mark Fisher
3109a78105 INT-1447 raising an error if any JmsTemplate attributes are set when an explicit 'jms-template' reference is also specified 2010-09-13 16:01:59 -04:00
Oleg Zhurakousky
7dbf096354 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-13 15:58:19 -04:00
Oleg Zhurakousky
f964f74f4e INT-1448, INT-1442 accepted changes by Iwein, added small refactoring to AbstractMessageSplitter, added support for 'requires-reply' attribute, added test cases' 2010-09-13 15:57:57 -04:00
Mark Fisher
62f80d822b removed System.out.println calls from tests 2010-09-13 15:18:42 -04:00
Mark Fisher
4db74cd558 INT-1440 the QoS properties are now only applied to JmsTemplate if it is not a referenced bean 2010-09-13 15:06:25 -04:00
Mark Fisher
f7bca5e9ba INT-1440 the QoS properties are now only applied to JmsTemplate if it is not a referenced bean 2010-09-13 15:05:10 -04:00
Oleg Zhurakousky
e5f67740e4 INT-1254, fixed parent pom and security pom to pick up version of spring security from parent definition 2010-09-13 14:51:45 -04:00
Mark Fisher
f454378013 INT-1412 added async send methods to AsyncMessagingOperations and AsyncMessagingTemplate 2010-09-13 13:10:53 -04:00
Iwein Fuld
7fc8de4a78 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-13 14:55:48 +02:00
Iwein Fuld
014ba8d8f2 INT-1442: Added check for empty collection to AbstractMessageSplitter.
- also introduced testcase based on suggestion from Jettro (see issue)
- leaving a TODO for the awkwardly placed return statement (AbstractMessageSplitter needs more rigorous cleanup which I'll tackle separately)
2010-09-13 14:54:31 +02:00
Josh Long
bba02133d6 fixed a compiler error. 2010-09-12 14:14:31 -07:00
Josh Long
6c959e6010 fixing issues related to fileType not propagating in the ftp handler 2010-09-12 13:06:01 -07:00
Josh Long
86fafd0002 INT-1433 fixing some bugs in the SFTP adapter reported by John Norton. the problems were mainly inconsistant propagation of a javabean property through the xsd and namespace handler, and failure to close input/outputstreams in the sftps synchronizer. 2010-09-12 12:41:37 -07:00
Iwein Fuld
0c247c3a84 INT-1443: Reduce complexity and remove duplication in CorrelatingMessageBarrier
- factored out completeGroup and expireGroup methods
- cleaned up imports
- some formatting
- added javadoc to CorrelationStrategy

Note on the CorrelationStrategy changes:
According to Postel's law it is right for the CorrelatingMessageHandler to do a null check for the result of the CorrelationStrategy, but it is also a good idea to throw a more meaningful exception from the strategy itself. We cannot enforce this in the contract without inconveniencing the users, so we don't.
2010-09-12 12:55:45 +02:00
Iwein Fuld
97ca31d68d INT-988 Added ignored test case. To reproduce bug:
- remove @Ignore
  - put breakpoint in PropertyOrFieldReference (line 167)
  - step through
2010-09-10 13:47:28 +02:00
Iwein Fuld
b0a54a813d added idea artifacts to .gitignore 2010-09-10 13:38:59 +02:00
Dave Syer
9d22d8abce INT-1347: move sequence details to MessageBuilder so they can be shared by router and splitter 2010-09-10 10:44:25 +01:00
Dave Syer
553f39b992 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-10 07:04:55 +01:00
Oleg Zhurakousky
7fb9322122 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-08 16:10:24 -04:00
Oleg Zhurakousky
23dd0a86b8 INT-1436, modified 'should-mark-messages-as-read' tobe only 'true' by default for IMAP and completely ignored for other mail protocols 2010-09-08 16:09:14 -04:00