Commit Graph

9623 Commits

Author SHA1 Message Date
Mark Fisher
28dd2571c0 Merge pull request #106 from garyrussell/INT-2162
INT-2162 Add apply-sequence to TCP Connection Factory
  INT-2154 Refactor TCP ConnectionFactorys to facilitate subclassing
  INT-2050 Code Polishing
2011-10-04 14:41:35 -04:00
Gary Russell
7981855c78 INT-2050 Code Polishing
INT-1876 Add AutoStart and Phase to TCP Endpoints

There was no way for an application to control the startup
of TCP endpoints. This is particularly an issue for controlling
availability of inbound endpoints.

The TCP Endpoints are mostly static, with dynamic behavior
being contained in connection factories. The factories
implement SmartLifecycle but there is no way to
configure auto-startup.

Adds auto-startup and phase attributes to all TCP endpoints

Starting/stopping an endpoint will start/stop the underlying
connection factory. When a connection factory is stopped,
all open connections are closed, and no new connections will
be acceptedi (inbound) or allowex (outbound).

While the factories implement SmartLifecycle, they return
false to auto-startup. We rely on the fact that
the endpoints are dependent on factories and
the factories will be started because of this dependency.

Finally, with collaborating endpoints (where an inbound and
outbound adapter are bound to the same factory), starting/
stopping one endpoint will affect the collaborating
endpoint too.

INT-1876 Polish Schema Docs

Doc was incorrectly talking about connection factories instead
of endpoints.

INT-2162 Add apply-sequence to Connection Factory

When messages are generated as a result of incoming tcp messages, and this
attribute is true (default=false), the sequenceNumber and
correlationId headers will be set. This will facilitate
downstream resequencing if necessary.

The 'ip_connection_id' header is still required for internal correlation
of reply messages to the right socket (regardless of whether downstream
components have altered the correlationId), and will contain the same value
as the correlationId (if set). This will not use up more memory for the
header content because they will both point to the same heap object.

The 'ip_connection_seq' header is deprecated and may be removed
in a future release.

TcpConnection.getConnectionSeq() has been renamed to
incrementAndGetConnectionSequence() because it is not a simple
getter method, it increments the connection's sequence number.

INT-2162 Update Docs for apply-sequence

Add documentation for apply-sequence attribute on
TCP Connection Factories.
2011-10-03 15:20:57 -04:00
Mark Fisher
03d6105f51 Merge pull request #105 from olegz/INT-2100
simplified ReceivingTask in ImapIdleChannelAdapter
2011-10-03 08:17:54 -04:00
Mark Fisher
86df10c696 Merge pull request #107 from garyrussell/INT-2163
Remove Abstract from Test Case Name
  Fix Failing Test on Windows
2011-10-02 12:15:15 -04:00
Gary Russell
ef5e78d526 INT-2163 Remove Abstract from Test Case Name
Tests in files containing Abstract in their names are not run
by maven.
2011-10-02 11:37:34 -04:00
Gary Russell
96c8d98715 INT-2163 Fix Failing Test on Windows
File timestamp is not rounded to seconds on Windows.

Also changed hard-coded /tmp to use java.io.tmpdir property.
2011-10-02 11:27:44 -04:00
Oleg Zhurakousky
f5fe67ad67 INT-2100 addressed PR comments 2011-09-30 16:30:04 -04:00
Oleg Zhurakousky
675f851ad2 INT-2100 simplified ReceivingTask in ImapIdleChannelAdapter 2011-09-30 15:57:36 -04:00
Mark Fisher
ae7a164726 Merge pull request #81 from markfisher/INT-1761
initial implementation of XPathFilter
2011-09-30 15:56:55 -04:00
Mark Fisher
a0951c8fb4 initial implementation of XPathFilter 2011-09-30 15:55:51 -04:00
Mark Fisher
836d04218e Merge pull request #104 from dturanski/INT-2160
Create ScriptEngine per execution
  Corrected concurrency issues with JRuby
2011-09-30 10:39:45 -04:00
Mark Fisher
3060030787 Create ScriptEngine per execution 2011-09-30 10:27:19 -04:00
David Turanski
a5ac75ea43 Corrected concurrency issues with JRuby 2011-09-30 09:54:44 -04:00
Mark Fisher
f78d6021a8 Merge pull request #103 from markfisher/INT-2149
Setters now expect a Map with Expression values
2011-09-30 09:48:24 -04:00
Mark Fisher
19bad23055 Setters now expect a Map with Expression values 2011-09-29 13:47:11 -04:00
Mark Fisher
0e0c0f7673 INT-2122: removed intervalTriggerType and cronTriggerType from xsd 2011-09-29 11:34:28 -04:00
Mark Fisher
cfccea104f INT-2150:fixed xsd doc errors 2011-09-29 10:59:09 -04:00
Mark Fisher
2a3df6f08f Merge pull request #100 from olegz/INT-2150
fixed copy/paste mistakes
  polishing schema, updated expected-type
  removed one more reference for Twitter4J from xsd
  fixed Twitter schema to remove Twitter4J references
2011-09-29 10:42:16 -04:00
Mark Fisher
2c134cc4a9 fixed copy/paste mistakes 2011-09-29 10:15:02 -04:00
Oleg Zhurakousky
232335630b INT-2150 polishing schema, updated expected-type 2011-09-29 09:32:26 -04:00
Oleg Zhurakousky
6e76e12d2f INT-2150 removed one mroe reference for Twitter4J from xsd 2011-09-29 08:42:12 -04:00
Oleg Zhurakousky
3e22d73963 INT-2150 fixed Twitter schema to remove Twitter4J references 2011-09-28 15:52:09 -04:00
Mark Fisher
8a8d8343a2 fixed test to run in different environments 2011-09-28 07:40:44 -04:00
Mark Fisher
40ce263281 fixed tests that had multiple triggers 2011-09-27 17:22:07 -04:00
Mark Fisher
6958001f45 Merge pull request #97 from markfisher/INT-2110
PollerParser correctly prevents multiple triggers
2011-09-27 17:03:56 -04:00
Mark Fisher
037e8aabc1 PollerParser correctly prevents multiple triggers 2011-09-27 16:52:00 -04:00
Mark Fisher
6e662f48eb Merge pull request #84 from markfisher/INT-1931
add URI variable Expressions to outbound gateway
2011-09-27 12:52:06 -04:00
Mark Fisher
9ce8c7b519 add URI variable Expressions to outbound gateway
parser and schema now support 'uri-variable'

add test for 'uri-variable' sub-elements

updated pom
2011-09-27 12:48:17 -04:00
Mark Fisher
9f188d7326 Merge pull request #94 from garyrussell/INT-2154
Minor Refactoring
2011-09-27 12:10:15 -04:00
Gary Russell
5624feacc0 INT-2154 Minor Refactoring
Factor out socket creation to a protected method, to facilitate
easier subclassing, enabling something other than the default
Socket factories to be used.
2011-09-27 11:56:17 -04:00
Mark Fisher
3079fe9bf0 Merge pull request #93 from markfisher/INT-2136
Only require 'queue-names' if no container ref
2011-09-27 09:55:03 -04:00
Mark Fisher
66a4f2fa42 Only require 'queue-names' if no container ref 2011-09-27 09:09:46 -04:00
Mark Fisher
d358711ce9 Merge pull request #88 from markfisher/INT-2143
added 'error-handler' attribute
2011-09-26 16:49:12 -04:00
Mark Fisher
cf076a832f added 'error-handler' attribute 2011-09-26 16:48:20 -04:00
Mark Fisher
0b43a9aa16 Merge pull request #90 from garyrussell/INT-2144
Document Socket Timeout Defaults
2011-09-26 08:48:38 -04:00
Gary Russell
d3a916f25c INT-2144 Document Socket Timeout Defaults
Add note about timeouts when using collaborating
channel adapters.
2011-09-26 08:48:03 -04:00
Mark Fisher
4c9b37f5d0 Merge pull request #91 from garyrussell/INT-2111
Reference Doc Polishing
2011-09-26 08:46:36 -04:00
Gary Russell
b7a4a48317 INT-2111 Reference Doc Polishing
Fix header names for (s)ftp gateways.
2011-09-26 08:45:26 -04:00
Mark Fisher
c313e813c2 Merge pull request #92 from markfisher/INT-2145
Removed hardcoded "restTemplate" references.
2011-09-26 08:44:04 -04:00
Mark Fisher
331e503e9d Removed hardcoded "restTemplate" references. 2011-09-26 07:55:49 -04:00
Mark Fisher
09e053e95f Merge pull request #87 from dturanski/INT-2088
added documentation for scripting and updated groovy section
2011-09-23 18:02:11 -04:00
Mark Fisher
c4daa33c09 fixed typo 2011-09-23 18:00:59 -04:00
David Turanski
19548b735d INT-2088 added documentation for scripting and updated groovy section 2011-09-23 17:37:32 -04:00
Mark Fisher
29d027c721 Merge pull request #85 from olegz/INT-1884
- polished test that intermittently break CI
  - increased the 'await' time in JdbcMessageStoreChannelIntegrationTests.testTransactionalSendAndReceive()
  - polished InnerDefinitionHandlerAwareEndpointParserTests.testAggregatorDefinitionSuccess to avoid NPE
  - increased its receive timeout as well
2011-09-23 11:11:58 -04:00
Oleg Zhurakousky
789c9d6da1 INT-1884 polished test that intermittently break CI
Increased the 'await' time in JdbcMessageStoreChannelIntegrationTests.testTransactionalSendAndReceive(), polished InnerDefinitionHandlerAwareEndpointParserTests.testAggregatorDefinitionSuccess to avoid NPE and increased its receive timeout as well
2011-09-23 11:04:53 -04:00
Mark Fisher
6ef95da490 Merge pull request #82 from markfisher/INT-2131
Add ReplyRequiredException
2011-09-23 10:19:25 -04:00
Mark Fisher
0439909b8a Add ReplyRequiredException 2011-09-23 10:16:00 -04:00
Mark Fisher
f9952da461 Merge pull request #79 from dturanski/INT-2130
* INT-2130:
  updated groovy module pom
  Moved scripting support from core to scripting
2011-09-23 09:29:45 -04:00
Mark Fisher
15469545a1 updated groovy module pom 2011-09-23 09:28:02 -04:00
David Turanski
08f81ae51d Moved scripting support from core to scripting
spring-integration-test: Enhanced RequestResponseScenario test framework

 changed scripting namespace URIs to standard pattern
2011-09-23 09:07:42 -04:00