Commit Graph

7448 Commits

Author SHA1 Message Date
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
Artem Bilan
3757592f2a INT-2631: remove BD logic from GroovyControlBus
* make 'Groovy Control Bus' similar to 'Expression Control Bus'
* add tests about `abstract` & `prototype` Beans
* fix about lost `groovy.lang.Script#println()` functionality in the `GroovyControlBusFactoryBean$ManagedBeansBinding`
* polishing `GroovyControlBusDelayerManagementTest` to show abilities & fixes with this issue

JIRA: https://jira.springsource.org/browse/INT-2631

INT-2631: polishing according to PR comments
2012-06-28 10:43:15 -04:00
Gunnar Hillert
f54bb340d6 Merge pull request #522 from garyrussell/INT-2630
* garyrussell-INT-2630:
  INT-2630 MessageHeaders/History Conversion Issue
2012-06-27 12:19:49 -04:00
Gary Russell
7501838b38 INT-2630 MessageHeaders/History Conversion Issue
Spring-expression 3.1 unconditionally converts all arguments for
method calls; MessageHeaders and MessageHistory do not have
no-arg constructors and the MapToMapConverter always attempts
conversion, in case any elements require conversion.

We are exploring a Spring 3.1 change but, in the meantime, we
have a detour in BeanFactoryTypeConverter in that we
can skip conversion of these types.
2012-06-27 11:55:34 -04:00
Gunnar Hillert
2dfd0be078 Merge pull request #524 from garyrussell/INT-2636
* garyrussell-INT-2636:
  INT-2636 Gateway Timeout Changes
2012-06-27 11:52:07 -04:00
Gary Russell
d66ba9ca74 INT-2636 Gateway Timeout Changes
Previously, the timeouts in @Gateway method annotations always
overrode the default timeout if specified in, say, XML.

Now, the @Gateway timeouts are applied only if

* The equivalent default was not set
* The annotation value is something other than the default (Long.MIN_VALUE)

Note: This is a breaking change for one scenario:

<int:gateway ... default-reply-timeout=1000 ... />

where the interface has a method annotated with @Gateway(replyTimeout=Long.MIN_VALUE)

In other words, when the user wants a default timeout on the gateway
but wants to override it for just the annotated method and happened to use
the new default value.

The @Gateway annotation does not allow us to detect whether its
attribute value came from the default or was explicitly set.

The work-around for this breaking change is to use a different negative
number to configure an infinite timeout:

@Gateway(replyTimeout=-1)
2012-06-27 09:15:31 -04:00
Gunnar Hillert
9b5d5fc6f7 Merge pull request #514 from garyrussell/INT-2515
* garyrussell-INT-2515:
  INT-2515 More Orderly Shutdown
2012-06-26 10:45:33 -04:00
Gary Russell
ae0abc4f6c INT-2515 More Orderly Shutdown
* Add beginShutdown() and endShutdown() to OrderlyShutdownCapable
* JMS/AMQP stop listener containers
* TCP (server side)
** after beginShutdown() disallow new connections, drop (log) new messages
** after endShutdown() close server socket
* HTTP (server side)
** after beginShutdown() disallow any new requests (503 Service Unavailable)

* Docbook updates
** What's new section
** Orderly Shutdown section.
2012-06-26 10:31:22 -04:00
Gary Russell
8c09655554 Merge pull request #521 from ghillert/INT-2454 2012-06-25 16:32:14 -04:00
Gunnar Hillert
da858b7451 INT-2454 - Doc: Add chapter 'AMQP Message Headers'
* Fix docs don't mention the need to add **amqp_** prefix to headers in order to have *DefaultAmqpHeaderMapper* add it to the message
* List all available standard AMQP Headers from class *AmqpHeaders*

For reference see: https://jira.springsource.org/browse/INT-2454
2012-06-25 16:31:46 -04:00
Gary Russell
0f9c8f5b58 Merge pull request #520 from ghillert/INT-2521 2012-06-25 16:31:29 -04:00
Gunnar Hillert
13890dab14 INT-2521 - SFTP Adapter Session Factory Doc Improvement
* fix Missing documentation of "enableDaemonThread" property of the SFTP session factory
* Reference documentation clean-up
* Document all properties of the DefaultSftpSessionFactory
2012-06-25 16:21:35 -04:00
Gunnar Hillert
9b541c8618 Merge pull request #508 from garyrussell/INT-2147
* garyrussell-INT-2147:
  INT-1849/INT-2147 Add Disposition to File Adapter
2012-06-25 12:06:55 -04:00
Gary Russell
066eb91100 INT-1849/INT-2147 Add Disposition to File Adapter
* Add *disposition-expression* to the inbound file adapter. This allows for operations such as *payload.delete()*, *payload.renameTo()* after the file is processed.
* The result of executing the expression (if any) is sent to the disposition-result-channel.
2012-06-25 11:38:20 -04:00
Gary Russell
703122a6fb Merge pull request #519 from ghillert/INT-2597 2012-06-22 11:12:22 -04:00
Gunnar Hillert
8a7fed15f6 INT-2597 - Fix the static port in Http Test
* Use *SocketUtils* to determine port dynamically rather than hard-coding it

Reference: https://jira.springsource.org/browse/INT-2597
2012-06-22 11:02:30 -04:00
Gary Russell
24d2acd368 Merge pull request #517 from ghillert/INT-2441 2012-06-22 10:02:52 -04:00
Gunnar Hillert
59d87ab7ae INT-2441 - Fix HTTP documentation
* Rework Http Inbound Gateway chapter, as it contains a link to a non-existing chapter
* Improve/rephrase/update chapter
* Add more relevant links to samples and external documentation
2012-06-22 09:59:21 -04:00
Gary Russell
341490d356 Merge pull request #516 from artembilan/INT-2623 2012-06-22 09:52:46 -04:00
Artem Bilan
3ea416bd84 INT-2623: document Delayer's changes
JIRA: https://jira.springsource.org/browse/INT-2623
2012-06-22 09:50:59 -04:00
Gary Russell
a9963e5d09 Merge pull request #515 from artembilan/INT-1132-Fix 2012-06-21 17:34:11 -04:00
Artem Bilan
0e31624083 INT-1132 Fix Failing Delyer Test
INT-1132: Eliminate delayer's tests sensitive

* There is no guarantee that a Message will be delayed after restart for exactly the remaining time; it may be delayed longer.
* Remove assert around 'receive time'
* Remove redundant LIFO test-case: now `DelayHandler` just uses simple iteration over `MessageGroup`

JIRA: https://jira.springsource.org/browse/INT-1132

Build report: https://build.springsource.org/browse/INT-B22X-JOB1-91/test/case/110952529
2012-06-21 17:31:25 -04:00
Gary Russell
7f81d294da Merge pull request #506 from ghillert/INT-2596 2012-06-21 15:27:11 -04:00
Gunnar Hillert
6aa323e66b INT-2596 Fix JMX Documentation Chapter
* <int-jmx:mbean-exporter...> doesn't exist in XSD v2.1 --> Should be **mbean-export**
* Convert tabs to spaces
* Fix code listings that go beyond margins
* Fixed several spelling errors
* Improve consistency
* Improve column layout of tables

For reference see: https://jira.springsource.org/browse/INT-2596

INT-2596 - PR Review

* Rephrased and clarified 3 paragraphs in the JMX chapter of the reference documentation
2012-06-21 15:24:36 -04:00
Gary Russell
97661cc39a Merge pull request #512 from artembilan/INT-2607 2012-06-21 14:47:06 -04:00
Artem Bilan
25a2efe59c INT-2607: refactor 'resolveId' with pC.isNested()
* add delegation to `BeanDefinitionReaderUtils.generateBeanName(definition, parserContext.getRegistry(), parserContext.isNested())`
in the `AbstractBeanDefinitionParser#resolveId()` implementations when it is necessary.
* remove redundant `shouldGenerateId()` & `shouldGenerateIdAsFallback()` when they don't make sense.
* additional simple polishing in the affected classes.
* remove TODO & forced 'id' attribute from JpaOutboundGatewayTests-context.xml to check that this solution works as was booked.

JIRA: https://jira.springsource.org/browse/INT-2607
2012-06-21 14:30:32 -04:00
Gary Russell
284464383d Merge pull request #513 from ghillert/INT-2290 2012-06-21 13:54:55 -04:00
Gunnar Hillert
a4a27e941f INT-2290 - Document Top Schema Elements in XML Module
* Make sure all top-level XML Elements have documentation
* Convert space to tabs
2012-06-21 13:45:49 -04:00
Gary Russell
af4dfbaa94 Merge pull request #511 from ghillert/INT-2444 2012-06-21 13:43:55 -04:00