Commit Graph

9623 Commits

Author SHA1 Message Date
Mark Fisher
29f4fe5948 Merge pull request #23 from ghillert/INT-2058
* INT-2058:
  polishing
  Added Xml schema documentation for the attributes: id, channel, directory, scanner (2.0 and 2.1 Schema)
2011-08-19 09:47:59 -04:00
Mark Fisher
2c8ba16211 polishing 2011-08-19 09:45:59 -04:00
Gunnar Hillert
c7f3a944e6 Added Xml schema documentation for the attributes: id, channel, directory, scanner (2.0 and 2.1 Schema)
Added Xml schema documentation for the attribute charset (2.0 and 2.1 Schema)

Added Xml schema documentation for the attribute filename-generator (2.0 and 2.1 Schema)

Added Xml schema documentation for the attribute filter (2.0 and 2.1 Schema)

Added Xml schema documentation for the attribute delete-files (2.0 and 2.1 Schema)

Added Xml schema documentation for the attribute delete-files (2.0 and 2.1 Schema)

Added Xml schema documentation for the elements: locker, nio-locker (2.0 and 2.1 Schema)

Added Xml schema documentation for the attribute: reply-channel (2.0 and 2.1 Schema)

Added Xml schema documentation for the attribute: reply-channel (2.0 and 2.1 Schema)

Fixed Xml schema documentation for the elements: locker, nio-locker (2.0 and 2.1 Schema)

Fixed Xml schema documentation for the elements: outbound-channel-adapter, outbound-gateway (2.0 and 2.1 Schema)

Documentation was missing for the "directory" attribute on complexType name="outboundFileBaseType" (2.0 and 2.1 Schema)

Documentation was missing for the "request-channel" attribute on element "outbound-gateway" (2.0 and 2.1 Schema)

Documentation was missing for the "request-channel" attribute on element "outbound-gateway" (2.0 and 2.1 Schema)

Final round of fixes. Every attribute and element now has documentation in the 2.0 and 2.1 xml schema
2011-08-19 09:33:26 -04:00
Mark Fisher
6f76a293b4 Merge pull request #21 from dturanski/INT-2062
Fixed GemfireMessageGroupStoreTest (changed Set to List to avoid equals() collisions affecting size())
2011-08-18 17:39:50 -04:00
David Turanski
6d40df291f INT-2062 - Fixed GemfireMessageGroupStoreTest (changed Set to List to avoid equals() collisions affecting size()) 2011-08-18 17:00:14 -04:00
Mark Fisher
180cce3d05 Merge pull request #20 from ghillert/INT-2061
* INT-2061:
  INT-2061 - Added description for auto-startup attribute in spring-integration-file-2.0.xsd
  INT-2061 - Added description for auto-startup attribute in spring-integration-file-2.1.xsd
2011-08-18 11:36:34 -04:00
Gunnar Hillert
bdd10df703 INT-2061 - Added description for auto-startup attribute in spring-integration-file-2.0.xsd 2011-08-18 11:10:38 -04:00
Gunnar Hillert
b8dec7471e INT-2061 - Added description for auto-startup attribute in spring-integration-file-2.1.xsd 2011-08-18 11:10:38 -04:00
Mark Fisher
625dc98242 Merge pull request #19 from joshlong/INT-2062
INT-2062
2011-08-18 06:52:38 -07:00
Josh Long
6a2a368c3e INT-2062 2011-08-18 06:36:49 -07:00
Mark Fisher
8116b8ba5e Merge pull request #17 from markfisher/INT-2047
* INT-2047:
  updated 2.0 xsd
  SftpSessionFactory -> DefaultSftpSessionFactory
2011-08-18 08:32:24 -04:00
Mark Fisher
baf3a69ffd updated 2.0 xsd 2011-08-18 07:42:23 -04:00
Mark Fisher
215eb65f9e SftpSessionFactory -> DefaultSftpSessionFactory 2011-08-18 07:42:23 -04:00
Mark Fisher
17c8759ceb Merge pull request #18 from joshlong/INT2060
ensured everything worked after merge
  general clean up

Issue: INT-2060
2011-08-17 22:55:12 -04:00
Josh Long
197021cd63 ensured everything worked after merge.. 2011-08-17 02:29:19 -07:00
Josh Long
dc5d821aee clean up... 2011-08-17 02:17:51 -07:00
Josh Long
3e8a774411 clean up... 2011-08-17 02:17:24 -07:00
Mark Fisher
6544414544 Merge pull request #16 from ghillert/INT-2043
Add @Filter annotation to appendix
  Add annotation documentation to 5.2.2 Configuring Filter
  Some documentation cleanup
2011-08-16 17:11:35 -04:00
Gunnar Hillert
1d2042de3f - INT-2043 Added @Filter annotation to appendix
- Added annotation documentation to 5.2.2 Configuring Filter
- Some documentation cleanup
2011-08-16 16:53:46 -04:00
Mark Fisher
254f0f1f50 Merge pull request #14 from dturanski/INT-2049
remove gemfire cfg files
  add namespace support
  add SpEL support to CacheWritingMessageHandler and general cleanup
2011-08-16 16:44:05 -04:00
David Turanski
3d9dc732f1 INT-2049 - removed gemfire cfg files 2011-08-16 16:42:19 -04:00
David Turanski
b07708fd9f INT-2049 added namespace support, also add SpEL support to CacheWritingMessageHandler and general cleanup 2011-08-16 16:42:19 -04:00
David Turanski
a6cda6d93d INT-2049 added namespace support, also add SpEL support to CacheWritingMessageHandler and general cleanup 2011-08-16 16:42:19 -04:00
Mark Fisher
0bba8827ca Merge pull request #15 from ghillert/INT-2052
INT-2052
2011-08-16 09:44:19 -07:00
Mark Fisher
21626a5465 Merge pull request #11 from markfisher/INT-1947
Add 'loggerName' property.
2011-08-16 09:42:17 -07:00
Gunnar Hillert
f0d42d1f91 #INT-2052 - Fixed some wording in README.md 2011-08-16 11:29:31 -04:00
Gunnar Hillert
0297614043 #INT-2052 - Sourounded --recursive with <code> to escape -- in README.md 2011-08-16 10:41:37 -04:00
Gunnar Hillert
5316b11805 #INT-2052 - Formatted README.md 2011-08-16 10:41:37 -04:00
Gunnar Hillert
97e9499b88 #INT-2052 - renamed readme.txt to README.md to allow for Markdown styling 2011-08-16 10:41:37 -04:00
Mark Fisher
b4f200fe38 Merge pull request #9 from garyrussell/INT-1884
Fix Intermittent Test Failure

Issue: INT-1884
2011-08-13 15:16:46 -04:00
Mark Fisher
11680bae22 Merge pull request #7 from garyrussell/INT-2040
INT-2040 Broken JMX Test
2011-08-13 12:05:42 -07:00
Mark Fisher
46e80d790e Add 'loggerName' property.
1. LoggingHandler now has a loggerName property
2. The <logging-channel-adapter> now has a 'logger-name' attribute

Issue: INT-1947
2011-08-13 14:05:54 -04:00
Gary Russell
82f1cbc715 INT-1884 Fix Intermittent Test Failure
The test is verifying at least one more poll is executed after capturing
the initial poll count. However we only did one receive and relying on
luck that another poll happened in the interim. Changed to do 2 receives.
2011-08-13 13:45:03 -04:00
Gary Russell
56cefae41d INT-2040 Broken JMX Test
The change to a long return value for MessageCount broke a JMX test
(expected Integer got Long)
2011-08-13 11:04:54 -04:00
Mark Fisher
6d3eac8c49 Merge pull request #6 from olegz/INT-2030
INT-2030 polished RedisMessageGroup
2011-08-12 13:09:31 -04:00
Mark Fisher
a352f19514 Revert "Merge pull request #6 from olegz/INT-2030"
Backing out this change in order to use the merge commit approach.

This reverts commit ab47ca704b.
2011-08-12 13:03:23 -04:00
Oleg Zhurakousky
ab47ca704b Merge pull request #6 from olegz/INT-2030
INT-2030 polished RedisMessageGroup

1. simplified size() method to simply return the sum of sizes from marked and unmarked
2. removed System,out.println
3. added more assertions to tests
4. cosmetic changes
2011-08-12 09:21:45 -04:00
Oleg Zhurakousky
699afbe7a1 INT-2030 polished RedisMessageGroup
1. simplified size() method to simply return the sum of sizes from marked and unmarked
2. removed System,out.println
3. added more assertions to tests
4. cosmetic changes
2011-08-11 17:36:01 -04:00
Mark Fisher
a598238c5e Updated to 2.1.0 Milestone 1 2011-08-11 15:35:53 -03:00
Mark Fisher
5eaa57df11 Merge pull request #5 from markfisher/INT-2046
INT-2046 added @ManagedAttribute to MessageStores
2011-08-11 11:10:29 -07:00
Mark Fisher
da2f275074 INT-2046 added @ManagedAttribute to MessageStores
Added to the getMessageCount() in GemfireMessageStore, MongoDbMessageStore, and RedisMessageStore.
2011-08-11 13:59:12 -04:00
Mark Fisher
bce562368c Merge pull request #4 from olegz/INT-2040
INT-2040 changed signature of MessageStore.getMessageCount() to return lo
2011-08-11 10:19:28 -07:00
Oleg Zhurakousky
521a602dad INT-2040 changed signature of MessageStore.getMessageCount() to return long. Changed affected implementations 2011-08-11 13:07:41 -04:00
Oleg Zhurakousky
94dea0855d INT-2030 finished with initial implementation fo Redis-based MessageGroupStore 2011-08-11 09:53:44 -04:00
Oleg Zhurakousky
28bcb4bfcf INT-2030 finished implementing all methods for Redis-based MessageGroupStore 2011-08-11 09:33:36 -04:00
Oleg Zhurakousky
c6e90e5a0f INT-2030 added support for marking individual messages in the group, polishing of existing code, added tests 2011-08-10 15:16:36 -04:00
Oleg Zhurakousky
f1e2434398 INT-2030 Injected RedisMessageStore into RedisMessageGroup to benefit from code reuse when adding/removing Messages from the group 2011-08-10 13:25:04 -04:00
Oleg Zhurakousky
5388149b3a INT-2030 added support for getOne() and markAll() to Redis MessageGroupStore 2011-08-10 13:14:50 -04:00
Mark Fisher
81f07f2c5c INT-2044 modified Spring AMQP dependency version to 1.0.0.RC3 2011-08-10 12:50:20 -04:00
Oleg Zhurakousky
665e76e50a INT-2030 added initial support for Redis MessageGroupStore 2011-08-10 12:39:45 -04:00