Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,837 Commits 25 Branches 0 Tags
df9e8aafc2f56d7a7fd08b9679a81af2cb4e6d4f
Commit Graph

3837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gary Russell
a7a6624186 INT1434 Remove parent pom from loanshark 2010-09-08 10:31:49 -04:00
ozhurakousky
6006ffdb13 fixed the configuration.xml doc file 2010-09-08 01:18:45 -04:00
ozhurakousky
a5938b0fb3 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-08 01:10:24 -04:00
ozhurakousky
8706143b89 INT-1426, removed references to @MessageMapping annotation 2010-09-08 01:09:59 -04:00
Gary Russell
e231111d80 INT-1434 Update to Roo 1.1.0.M3 2010-09-07 21:05:13 -04:00
Dave Syer
04dbe63366 INT-1420: add javadocs 2010-09-07 10:24:53 +01:00
Dave Syer
e1704c6267 INT-1429: tidy up JMX 
- rename some classes and add Statistics abstraction
- INT-1429: rename SimpleChannelMonitor
 2010-09-07 09:11:48 +01:00
Dave Syer
ca1f4869e4 Weaken assertion some more to prevent ci failing 2010-09-07 07:53:33 +01:00
ozhurakousky
7df4425c41 INT-1427, made dependency on 'org.springframework.commons' optional 'resolution:=optional' 2010-09-06 20:39:07 -04:00
Chris Beams
5fd539ca5b Fix manifests missing spring-commons imports (INT-1427) 2010-09-06 22:03:48 +02:00
ozhurakousky
46d9ead135 modified .classpath to not point to empty directories resulting in projects marked with errors 2010-09-04 08:34:33 -04:00
ozhurakousky
704aef31f5 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-04 08:08:48 -04:00
ozhurakousky
22e3b6e369 testing new file 2010-09-04 08:05:48 -04:00
ozhurakousky
095e941c9a created readme.txt 2010-09-04 08:02:46 -04:00
ozhurakousky
79b85955a4 test commit 2010-09-04 07:54:39 -04:00
Chris Beams
beafd5566c Polish whitespace and comments in pom files 
- Convert spaces to tabs on -ftp/pom.xml

- Normalize multi-line comments to fit the following style:
    <!--
        depend explicitly on 2.0 in order to pick up the new
        release:update-versions goal
    -->

- Revert some of the formatting that the Maven release:update-versions
  goal forced on us. After it failed to perform its duties during the M7
  release, it appears we will not be using it anymore.
 2010-09-04 13:24:25 +02:00
Chris Beams
38cc72ac6b Add missing <plugins> tag in <profile> declarations 2010-09-03 20:20:15 +00:00
Chris Beams
a97bf871e5 Move upload-dist into milestone and release profiles (INT-1388) 
The following commands now upload zips to dist.springframework.org:

- `mvn -Pmilestone deploy`
- `mvn -Prelease deploy`

The following do not:

- `mvn -Psnapshot deploy`
- `mvn -Pstaging deploy`
 2010-09-03 20:12:56 +00:00
Chris Beams
2d88bdd2e8 Increment versions to 2.0.0.BUILD-SNAPSHOT 2010-09-03 20:12:54 +00:00
Mark Fisher
7d73117d7a updates for m7 release 2010-09-03 18:56:05 +00:00
Chris Beams
f4efc62ca7 Increment versions to 2.0.0.M7 2010-09-03 18:23:12 +00:00