Commit Graph

6614 Commits

Author SHA1 Message Date
Mark Fisher
894d145af4 Merge pull request #349 from garyrussell/INT-2427
INT-2427 Fix Types of AMQP Outbound Endpoints
2012-02-13 12:15:08 -05:00
Gary Russell
ef99ccde0e INT-2427 Fix Types of AMQP Outbound Endpoints
Logic for returning gateway Vs. channel-adapter was
reversed.
2012-02-13 12:14:25 -05:00
Mark Fisher
797806811b Merge pull request #346 from olegz/INT-2412 2012-02-13 12:05:11 -05:00
Oleg Zhurakousky
76f6c0877e INT-2412
removed priority enumeration from the 2.0 and 2.1 schema

fixed documentation, added tests
2012-02-13 12:02:02 -05:00
Mark Fisher
8789d850b3 Merge pull request #344 from olegz/INT-1734 2012-02-13 08:34:46 -05:00
Oleg Zhurakousky
f57fdcd516 INT-1734
added support for case insensitivity for the user defined header prefix in DefaultHttpHeaderMapper
2012-02-13 08:15:38 -05:00
Mark Fisher
caa25251a9 Merge pull request #325 from artembilan/INT-2405
INT-2405 fix MessageProcessor for <header-value>
2012-02-06 10:18:18 -05:00
Artem Bilan
920e2f2f50 INT-2405 fix MessageProcessor for <header-value>
1. MethodInvokingHeaderValueMessageProcessor => MessageProcessingHeaderValueMessageProcessor because now he uses MessageProcessor
2. polishing HeaderEnricherParserSupport
3. GroovyHeaderEnricherTests: add check to HeaderValueMessageProcessor for Groovy scripts.
4. build.gradle: add dependency to 'spring-integration-test' for 'spring-integration-groovy'.
2012-02-06 10:17:53 -05:00
Mark Fisher
a55cb2c18b Merge pull request #323 from artembilan/INT-2399
INT-2399 fix processMessage for service-activator
2012-02-06 10:00:45 -05:00
Artem Bilan
51da77d14d INT-2399 fix processMessage for service-activator
ServiceActivatorFactoryBean#createMessageProcessingHandler: force 'processMessage' method-name parameter into constructor ServiceActivatingHandler for MessageProcessor
Test for check 'handlerMethods' in ServiceActivatingHandler's MethodInvokingMessageProcessor
Integration test for <service-activator> with invalid Groovy inline script
2012-02-06 09:59:46 -05:00
Mark Fisher
3ab14bdd2c Merge pull request #343 from ghillert/INT-2423
Removed 'KEEP_RELEASED_MESSAGES' constant from AbstractCorrelatingMessageHandlerParser

  Removed 'keep-released-messages' attribute

  For reference see: https://jira.springsource.org/browse/INT-2423
2012-02-06 09:54:42 -05:00
Gunnar Hillert
a6f400152e INT-2423 Remove 'KEEP_RELEASED_MESSAGES' Constant
Removed 'KEEP_RELEASED_MESSAGES' constant from AbstractCorrelatingMessageHandlerParser
2012-01-31 10:11:26 -05:00
Gunnar Hillert
4b564535d2 INT-2423 remove 'keep-released-messages' attribute
For reference see: https://jira.springsource.org/browse/INT-2423
2012-01-30 23:54:07 -05:00
Mark Fisher
251ee040c9 Merge pull request #342 from garyrussell/INT-2418
INT-2418 Pool Size and NIO
2012-01-30 10:18:59 -05:00
Gary Russell
7927e1aa11 INT-2418 Pool Size and NIO
https://jira.springsource.org/browse/INT-2418

Add documentation about setting the pool-size to a minimum of
3 when using-nio="true".
2012-01-30 10:18:18 -05:00
Mark Fisher
e219174990 Merge pull request #341 from garyrussell/INT-2409
INT-2409 Fix STS 'Missing Bean' Warnings
2012-01-30 10:15:47 -05:00
Gary Russell
3518f3cb4e INT-2409 Fix STS 'Missing Bean' Warnings
Some generated bean names (e.g. LoggingHandler) cause
warnings in STS:

(Warning "Referenced bean
'org.springframework.integration.handler.LoggingHandler#0' not found")

Fix is to register these beans as components so an event is fired.
2012-01-30 10:15:10 -05:00
Mark Fisher
0be3dbc5c9 Merge pull request #339 from garyrussell/INT-2414
INT-2414 Error When container-class Supplied
2012-01-30 10:08:17 -05:00
Gary Russell
6f2dcab4b2 INT-2414 Error When container-class Supplied
JMS backed channels can have container-type and
container-class. Parser rejected container-class because
the schema has a default for container-type.

Both attributes are allowed; user must set container-type
appropriately (based on the superclass of the custom class)
when container-class is provided.
2012-01-24 12:33:51 -05:00
Mark Fisher
670495c6c0 Merge pull request #338 from garyrussell/INT-2415 2012-01-23 12:14:03 -05:00
Gary Russell
864a4ef291 INT-2415 MBean Name Collisions in Tests
JMX Tests failed due to InstanceAlreadyExistsException; name
collisions between MBeans registered in multiple tests.

Adds a domain to the new tests added to fix INT-2413 to
force unique MBean names.
2012-01-23 11:52:43 -05:00
Mark Fisher
235fb0e82e Merge pull request #324 from artembilan/INT-2180
INT-2180: fix Delayer's scheduler docs
2012-01-23 10:43:19 -05:00
Artem Bilan
7efff7ef7a INT-2180: fix Delayer's scheduler docs
spring-integration-2.1.xsd: Delayer's scheduler 'documentation' & tool's expected-type.
Reference Manual: Delayer's introduction: fix scheduler's <interfacename>.
2012-01-23 10:42:47 -05:00
Mark Fisher
03af248b55 Merge pull request #337 from garyrussell/INT-2413
INT-2413 <int-jmx:mbean-export/> And <control-bus>
2012-01-23 10:36:00 -05:00
Gary Russell
b899595e01 INT-2413 <int-jmx:mbean-export/> And <control-bus>
When an AbstractMappingMessageRouter is included in an
ApplicationContext that also has an <int-jmx:mbean-exporter/>,
the @ManagedOperations (set and remove mapping) are no longer
visible to the <control-bus/>.

Adds these methods to a new interface MappingMessageRouterManagement,
thus making them available on the proxy that the MBean exporter
creates.
2012-01-23 10:34:58 -05:00
Mark Fisher
e39a40581d Merge pull request #336 from garyrussell/INT-2411
INT-2411 default-output-channel Ignored on RLR
2012-01-23 10:31:27 -05:00
Gary Russell
46c9c807a2 INT-2411 default-output-channel Ignored on RLR
https://jira.springsource.org/browse/INT-2411

Namespace problem only; the default-output-channel was
not bound to the RecipientListRouter.

Workaround is to declare the router using <bean/> syntax.
2012-01-23 10:30:48 -05:00
Mark Fisher
9970cb03b4 Merge pull request #335 from garyrussell/INT-2402
INT-2402 Fix Versioned Schema Example
2012-01-23 10:27:48 -05:00
Gary Russell
6718556200 INT-2402 Fix Versioned Schema Example
https://jira.springsource.org/browse/INT-2402

Revert example showing how to use versioned schema to
actually use a versioned schema.
2012-01-23 10:27:13 -05:00
Mark Fisher
29e1e289d2 Merge pull request #333 from garyrussell/INT-2406 2012-01-23 10:24:53 -05:00
Gary Russell
0899768d1e INT-2406 Add JMSTimestamp Property To Headers
Inbound JMSTimestamp property is now mapped to header
jms_timestamp.
2012-01-23 10:22:30 -05:00
Mark Fisher
ce62274446 Merge pull request #332 from garyrussell/springNature 2012-01-23 10:16:24 -05:00
Gary Russell
af8180446a INT-2408 Add Spring Project Nature with Gradle
STS needs Spring Project Nature to get classpath XSD/Namespace resolution.
When switching back and forth between 2.0 and 2.1, ./gradlew eclipse
removes Spring Project Nature.

It is now added by ./gradlew eclipse when generating eclipse metadata
files.
2012-01-23 10:15:47 -05:00
Mark Fisher
dc002d9bfc Merge pull request #328 from garyrussell/INT-2407
INT-2404 Fix Auto-Created Channel; Event, TCP, UDP
2012-01-23 10:13:18 -05:00
Gary Russell
292aa90599 INT-2404 Fix Auto-Created Channel; Event, TCP, UDP
The AbstractChannelAdapterParser creates an implicit DirectChannel
if the adapter has no 'channel' attribute.

The Event, TCP, and UDP channel adapter parsers did not bind
this channel to the adapter and AC initialization failed with
'outputChannel is required'.

Further, the event schema marked the channel as being 'required',
precluding this feature.

INT-2407 Remove Channel use="required"

Parsers automatically generate the channel when none is provided.

- JMX
- JDBC
- SFTP
- Redis
- Feed
- XMPP
- Mail
- FTP
- HTTP
2012-01-23 10:12:34 -05:00
Mark Fisher
e7b514a1e4 Merge pull request #312 from ghillert/INT-2393
INT-2393 Add Sonar Support (Gradle Plugin)
2012-01-23 10:01:57 -05:00
Gunnar Hillert
92c974d443 INT-2393 Add Sonar Support (Gradle Plugin)
INT-2393 - Changes in Build.gradle based on Code Review
* Changed line to *jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=org.springframework.integration.*"*
* Added *props["sonar.jacoco.reportPath"] = "${buildDirName}/jacoco.exec" to make build work with default build directory*
* Therefore able to remove: *buildDir = "target"*
* Moved *sonar* block to bottom of build script
* Added comments around the **configurations** block
* Switched to use Gradle Properties instead of System Properties for Sonar parameters

INT-2393 - rootProject.hasProperty works
* More simplifications after finding out that **rootProject.hasProperty** works inside the Sonar closure

INT-2393 Based on code review: Fixed build.gradle
Based on Code Review, converted println statement to logger.info in build.gradle
2012-01-23 10:01:12 -05:00
Mark Fisher
c19191fe70 Merge pull request #331 from cbeams/gradle
Improve api doc generation

  Upgrade to Gradle 1.0-milestone-8 snapshot
2012-01-23 09:58:50 -05:00
Chris Beams
55f23932b4 Improve api doc generation
- Touch up title text
 - Add 'header' (shows up in upper right and left of frameset)
 - Ensure @author attribution shows up (not true by default!)
 - Remove now-obsolete custom Javadoc CSS and background image
2012-01-23 09:57:38 -05:00
Chris Beams
f0e8bf10a9 Upgrade to Gradle 1.0-milestone-8 snapshot
Picks up changes that solve intermittent tests described at
http://issues.gradle.org/browse/GRADLE-2035

Also uses new snapshot versions of bundlor and docbook plugins that fix
incompatibility problems with 1.0-milestone-8.
2012-01-23 09:57:38 -05:00
Gary Russell
ca89573209 INT-2400 More Invalid Class Names in Schemas
File, Feed, Ftp, Redis
2012-01-14 10:56:15 -05:00
Gunnar Hillert
2b5ddefa9d INT-2403 - Fix Samples Url in AMQP Doc Chapter 2012-01-13 15:09:06 -05:00
Mark Fisher
277ba477a4 Merge pull request #318 from garyrussell/INT-2400a
INT-2400 More expected-type Fixes
2012-01-13 14:26:11 -05:00
Gary Russell
4872876e4f INT-2400 More expected-type Fixes
CollectionFilter in core; package changes in security.
2012-01-13 13:40:40 -05:00
Mark Fisher
10a384a6d1 Merge pull request #316 from garyrussell/INT-2400
NT-2400 Fix tool:expected-type Classes
2012-01-13 13:22:31 -05:00
Gary Russell
f76f63f23a NT-2400 Fix tool:expected-type Classes
* MessageChannel was moved from core to the base package.
* ChannelResolver moved from core to support.
* TcpConnectionInterceptorFactoryChain was incorrect.
2012-01-13 13:21:41 -05:00
Chris Beams
efc5e75817 Update reference doc copyright to 2012 2012-01-12 13:07:27 +01:00
Spring Buildmaster
da800ab508 Increment version to 2.1.1.BUILD-SNAPSHOT 2012-01-06 13:11:05 -08:00
Spring Buildmaster
455696815d Release version 2.1.0.RELEASE 2012-01-06 13:11:00 -08:00
Oleg Zhurakousky
33fb666bdd Updated build.gradle with new upper range for org.apache.commons.net
Updated build.gradle with new upper range for org.apache.commons.net
2012-01-06 16:02:29 -05:00