Commit Graph

6626 Commits

Author SHA1 Message Date
Oleg Zhurakousky
9be17fa4df Merge pull request #554 from garyrussell/INT-2665
* INT-2665:
  INT-2665 JMX Endpoints And Remote MBeanServer
2012-07-19 13:05:07 -04:00
Gary Russell
c63141f6e0 INT-2665 JMX Endpoints And Remote MBeanServer
JMX endpoints need a reference to an MBeanServer. The MBeanServer
is a sub-interface of MBeanServerConnection.

When connecting to a remote MBeanServer, the server is an
instanceof MBeanServerConnection, not MBeanServer.

Change the Endpoints to get a reference to an MBeanServerConnection.

Add IOException catch clauses where necessary.
2012-07-19 13:04:04 -04:00
Oleg Zhurakousky
b39b0c2681 Merge pull request #556 from artembilan/INT-2678
* INT-2678:
  INT-2678: fix a couple of typo
2012-07-19 12:58:54 -04:00
Artem Bilan
09c92cf04d INT-2678: fix a couple of typo
* changes-2.0-2.1.xml: the subject of INT-2678
* delayer.xml <classname> tag typo
2012-07-19 11:29:19 +03:00
Gary Russell
bc63baa3e6 Merge pull request #555 from olegz/INT-2677 2012-07-18 13:26:12 -04:00
Oleg Zhurakousky
c6076f350f INT-2677 Upgrade JMS Module to use ActiveMQ 5.6.0 2012-07-18 13:25:46 -04:00
Gary Russell
8c9e307f49 Merge pull request #547 from ghillert/INT-2262 2012-07-16 14:52:12 -04:00
Gunnar Hillert
b07abcd30c INT-2262 - Add reply-timeout to Outbound Gateways
For reference see: https://jira.springsource.org/browse/INT-2262

Add reply-timeout attribute to:

* Amqp Outbound Gateway
* File Outbound Gateway
* Ftp Outbound Gateway
* Sftp Outbound Gateway
* Ws Outbound Gateway

Update Schema Documentation for reply-timeout attribute:

* spring-integration-jpa-2.2.xsd
* spring-integration-jms-2.2.xsd
* spring-integration-jdbc-2.2.xsd
* spring-integration-ip-2.2.xsd
* spring-integration-http-2.2.xsd

Update the *What's new in Spring Integration 2.2* section in the reference manual

INT-2262 - Code Review

* Update copyright year for affected files
* Update author tags for affected files
2012-07-16 14:37:16 -04:00
Gunnar Hillert
386be70dda Merge pull request #543 from garyrussell/INT-2285
* garyrussell-INT-2285:
  INT-2285 Implement max-subscribers on Channels
2012-07-16 14:17:36 -04:00
Gary Russell
2ecb14de2a INT-2285 Implement max-subscribers on Channels
Add a subscriber limit on both unicast and publish-subscribe
channels. This permits detection of inadvertent channel wiring
during context initialization.

Also add a mechanism to globally set these defaults.

Two properties are added to ChannelInitializer. If the
'channelInitializer' bean is declared before a channel, and
these properties are set, it will globally override the
default (Integer.MAX_VALUE) for these properties.

For example:

    <bean id="channelInitializer" class="org.springframework.integration.config.xml.ChannelInitializer">
        <property name="autoCreate" value="true" />
        <property name="defaultMaxUnicastSubscribers" value="1" />
        <property name="defaultMaxMulticastSubscribers" value="2" />
    </bean>

will make the default max-subscribers 1 and 2 for <channel/> and
<publish-subscribe/> channels respectively.

Also applies to module channels (jms, amqp, redis).
2012-07-16 14:12:27 -04:00
Gary Russell
a90a7e8e0b Merge pull request #549 from ghillert/INT-2574 2012-07-16 10:38:02 -04:00
Gunnar Hillert
0d81837e1b INT-2574 Document "max-rows-per-poll" vs "max-messages-per-poll"
For reference see: https://jira.springsource.org/browse/INT-2574
2012-07-16 10:37:24 -04:00
Gary Russell
c5d6980a5b Merge pull request #542 from ghillert/INT-1958
Previous merge should have referenced #552
2012-07-12 18:17:05 -04:00
Gunnar Hillert
9a8f2dae0b INT-1958 - Make HttpRequestHandlingEndpointSupport public
For reference: https://jira.springsource.org/browse/INT-1958
2012-07-12 18:13:28 -04:00
Gary Russell
6753a379bc Merge pull request #542 from olegz/INT-2666 2012-07-12 17:53:37 -04:00
Oleg Zhurakousky
760c488e41 INT-2666 Fix NPE in SimpleMessageStore
INT-2666 polished test

Polishing
2012-07-12 17:52:22 -04:00
Gary Russell
b429e1ff2d Merge pull request #550 from olegz/INT-2659 2012-07-12 11:50:00 -04:00
Oleg Zhurakousky
be60db8065 INT-2659 upgraded to Spring Data Redis 1.0.1 2012-07-12 10:59:33 -04:00
Gary Russell
e6708ad6ae Merge pull request #540 from ghillert/INT-2657 2012-07-10 22:58:55 -04:00
Gunnar Hillert
39ee7a4429 INT-2657 - Spelling Error in AbstractMailReceiver
* Also fixed spelling error in *PollableJmsChannelTests*
2012-07-10 22:55:44 -04:00
Oleg Zhurakousky
ee0dcd8020 Merge pull request #544 from garyrussell/INT-2658
* INT-2658:
  INT-2658 Upgrade Spring to 3.1.2
2012-07-10 19:15:35 -04:00
Gary Russell
047978860e INT-2658 Upgrade Spring to 3.1.2 2012-07-10 19:14:32 -04:00
Oleg Zhurakousky
468fbbc6c7 Merge pull request #538 from garyrussell/INT-2633
* INT-2633:
  INT-2633 Add File Disposition to (S)FTP Inbound
2012-07-10 19:05:52 -04:00
Gary Russell
e6e43100b5 INT-2633 Add File Disposition to (S)FTP Inbound
FileReadingMessageSource supports disposition of the payload
after the message is sent (or via transaction synchronization).

The (S)FTP adapters delegate to an FRMS; add support for the
file disposition expression, result channel, and send timeout
to the (S)FTP adapters.

Also tested with ftp sample - INTSAMPLES-83 - patch will be
committed once this is in a milestone.
2012-07-10 19:04:59 -04:00
Oleg Zhurakousky
d0f26cd618 Merge pull request #537 from johndoe/INT-2652
* INT-2652:
  INT-2652 Fix mget for FTP
2012-07-10 17:07:32 -04:00
Gary Russell
b8f7d01f69 INT-2652 Fix mget for FTP
FTP servers return full path from listNames() whereas SFTP
returns just the filename. mget logic assumed SFTP behavior.

Add a test to see if the filename already starts with the remote
directory and remove it before calling get() (which assumes just
the filename).

Includes an @Ignored test for FTP and SFTP that runs an mget
against a server.
2012-07-10 17:06:21 -04:00
Oleg Zhurakousky
e73d3a3425 Merge pull request #541 from garyrussell/INT-2660
* INT-2660:
  INT-2660 NPE When Using SSL and NIO with Defaults
2012-07-10 16:41:26 -04:00
Gary Russell
09f3f7c342 INT-2660 NPE When Using SSL and NIO with Defaults
DefaultTcpNioSSLConnectionSupport and DefaultTcpNetSSLSocketFactorySupport need
an SSLContext which is set up in afterPropertiesSet(). However, when configuring
the connection factories with default strategies, afterPropertiesSet() is not
called. Result: NullPointerException.

Add call to afterPropertiesSet() where appropriate and tests to verify.
2012-07-10 16:40:21 -04:00
Oleg Zhurakousky
ef498d2d94 Merge pull request #533 from garyrussell/INT-2648
* INT-2648:
  INT-2648 UDP - Don't Hold a Scheduler Thread
2012-07-10 16:33:15 -04:00
Gary Russell
eb9c25615b INT-2648 UDP - Don't Hold a Scheduler Thread
Previously, the UDP inbound adapter was incorrectly using
the default task scheduler (taskScheduler) to run its main
receive activity. Once a packet is read, it is handed off
to another thread for message processing, using a configured
(or default) task executor.

We should not hold on to a scheduler thread permanently; the
default scheduler has only 10 threads and one user's app
stopped working when using 10 inbound adapters.

The work around was to define an explicit 'taskScheduler'
bean with more threads.
2012-07-10 16:32:16 -04:00
Gary Russell
62f96fa194 Merge pull request #539 from ghillert/INT-2656 2012-07-06 18:33:31 -04:00
Gunnar Hillert
e6a5eb925d INT-2656 - Fix Mail Adapter Exceptions
For reference see: https://jira.springsource.org/browse/INT-2656
2012-07-06 18:18:10 -04:00
Gary Russell
f26719d23c Merge pull request #530 from ghillert/INT-2473 2012-07-06 15:58:36 -04:00
Gunnar Hillert
2877776823 INT-2473 - Update Doc for Xslt Transformers
INT-2473 Document XSD for xslt-transformer

* convert spaces to tabs in XsltPayloadTransformerParser
* Add JavaDoc to ResultTransformer

INT-2473 - Code/Doc Review

* Add documentation for *SourceFactories*
* Add links
* Rephrase section on *ResultTransformers*

Minor polish
2012-07-06 15:57:30 -04:00
Oleg Zhurakousky
23085ba31d Merge pull request #535 from garyrussell/INT-2650
* INT-2650:
  INT-2650 Don't Convert byte[]
2012-07-06 13:54:04 -04:00
Gary Russell
4eeab94d59 INT-2650 Don't Convert byte[]
The problem reported by INT-2630 was more extensive. For example,
the unconditional parameter conversion causes arrays to be copied
unnecessarily.

The BeanFactoryTypeConverter now does a no-op conversion whenever
the source type is assignable to the target type.

This effectively reverts to the Spring 3.0 behavior, where this
assertion resulted in the argument not being added to the
argsRequiringConversion array.

Polishing

Add a couple more tests
2012-07-06 13:52:53 -04:00
Spring Buildmaster
d1d44305f8 [artifactory-release] Next development version 2012-07-02 17:52:40 -04:00
Spring Buildmaster
4232f88bda [artifactory-release] Release version 2.2.0.M3 2012-07-02 17:51:59 -04:00
Gunnar Hillert
9c03811b75 Merge pull request #532 from garyrussell/INT-2647
* garyrussell-INT-2647:
  INT-2647 spring-tx Needed as Transitive Dependency
2012-07-02 16:38:39 -04:00
Gary Russell
7fc71fb5b5 INT-2647 spring-tx Needed as Transitive Dependency
Pseudo transaction support means some projects now
need a transitive dependency to spring-tx. Previously
the project was marked as optional in the POM.
2012-07-02 16:16:11 -04:00
Oleg Zhurakousky
d2d9d67edb INT-2610 Fix Gateway Mapping Issue
Fix the inability for mappings by convention to be overriden with payload expression

Cherry-pick PR #531
2012-07-02 13:19:25 -04:00
Gary Russell
a54bcf3cdf Merge pull request #529 from artembilan/INT-2641 2012-06-29 09:48:55 -04:00
Artem Bilan
dce4e8ec01 INT-2641: fix JavaDoc warnings
JIRA: https://jira.springsource.org/browse/INT-2641
2012-06-29 09:42:58 -04:00
Gunnar Hillert
ba9060057a Merge pull request #526 from garyrussell/INT-2640
* garyrussell-INT-2640:
  INT-2640 Fix Failing JDBC Test on OSX
2012-06-29 09:36:25 -04:00
Gary Russell
ff89f05854 INT-2640 Fix Failing JDBC Test on OSX
The test previously used Derby and there was some kind of timing problem
during initialization. Changed to H2 instead.
2012-06-29 09:35:33 -04:00
Gary Russell
3bdce8cdf3 Merge pull request #525 from ghillert/INT-2289 2012-06-29 08:53:22 -04:00
Gunnar Hillert
bc244eff8f INT-2289 - Make update optional for JDBC Outbound Gateway
For reference: https://jira.springsource.org/browse/INT-2289
2012-06-28 20:04:22 -04:00
Gunnar Hillert
884a4e5bb3 Merge pull request #527 from garyrussell/INT-2635
* garyrussell-INT-2635:
  INT-2635 Set Buffer Size for Piped Streams
2012-06-28 15:53:56 -04:00
Gary Russell
57755a07ed INT-2635 Set Buffer Size for Piped Streams
Improve performance.

For NIO sockets, a pair of PipedInput/OutputStreams are
used to transfer data from the reading thread to the
assembling thread.

The stream used the default buffer size (1024) which was
inefficient for large messages.

This change uses the underlying socket's receiveBufferSize
attribute to set the size of the piped stream, allowing
for more efficient data transfer.

Also adjusts the mocks in the deadlock detection test
to ensure the received data is larger than the pipe
buffer size.
2012-06-28 11:07:00 -04:00
Gary Russell
9642a18307 Merge pull request #518 from artembilan/INT-2631 2012-06-28 10:55:55 -04:00