Commit Graph

130 Commits

Author SHA1 Message Date
Chris Beams
c8a24acfc6 Catch poms up with 2.0.1.BUILD-SNAPSHOT version 2010-11-26 11:26:07 -07:00
Mark Fisher
c712ac6315 Release version 2.0.0.RELEASE 2010-11-22 21:23:47 -05:00
Chris Beams
365108e7e3 Reflect hamcrest 1.1 dependency in generated poms 2010-11-22 16:18:21 -07:00
Chris Beams
1d3f4b2987 Upgrade junit:junit:4.7 -> junit:junit-dep:4.8.2
junit-dep does not bundle dependencies like hamcrest. This avoids
'duplicate package org.hamcrest' errors during javadoc generation
2010-11-22 15:06:02 -07:00
Gary Russell
c5dba36865 INT-1552 Add error-channel to other endpoint docs; schema doc polishing 2010-11-18 18:21:14 -05:00
Mark Fisher
f3e854b10c INT-1568 removed the MessageHeaders.PREFIX constant since it's no longer necessary. Also added @ManagedOperation to the IntegrationMBeanExporter's getChannelSendRate(..) method. 2010-11-18 00:03:58 -05:00
Gary Russell
cf5f51fdb5 INT-1624 Polish ip and jms schemas for error-channel 2010-11-17 16:49:13 -05:00
Oleg Zhurakousky
67b26da0e0 polishing removed @Overides as well as fixed warnings in JMS and JMX 2010-11-16 16:11:19 -05:00
Mark Fisher
ed9a8d90a3 INT-1626 the JMS 'message-driven-channel-adapter' element now accepts the 'error-channel' attribute 2010-11-16 02:11:39 -05:00
Mark Fisher
c6d68c9e2a INT-1623 replaced 'exception-mapper' with 'error-channel' on 'gateway' and JMS 'inbound-gateway' elements 2010-11-15 23:57:58 -05:00
Chris Beams
536fda2200 Check in Gradle-generated poms for convenience (INT-1609)
For ease of use by those (a) more familiar with Maven or (b) relying
on m2eclipse support within Eclipse/STS, generated poms are now checked
in. Changes to these files will be overwritted on subsequent gradle
builds.

Any changes to project dependencies should first be reflected in
build.gradle; then run `gradle generatePom` or simply `gradle build`
to see the change reflected in the pom(s).

Note that org.springframework.integration.ip.tcp.TcpInboundGatewayTests
currently fails when running `mvn clean test` from the root. This
problem does not manifest when running `gradle clean test`. The latter
is what's most important; Gary has been contacted to take a look at the
former.

Issues resolved:
    INT-1609, INT-1610, INT-1611
2010-11-12 23:27:32 -08:00
Mark Fisher
dbbcde22cd INT-1569 added inboundPrefix and outboundPrefix to DefaultJmsHeaderMapper. For now, the defaults are blank. 2010-11-12 15:15:36 -05:00
Chris Beams
ee34695bc4 Merge branch 'master' into buildSrc-extraction
Conflicts:
	spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
2010-11-11 10:13:14 -08:00
Chris Beams
a9c70aa1e7 Synchronize with latest buildSrc updates
buildSrc updated to use latest Gradle wrapper.  See buildSrc git log
for complete details; in short, eclipse JDT prefs are now auto-generated
and the gradle daemon is no longer 'on by default', but must be enabled
with --daemon or -Dorg.gradle.daemon=true.

* removed all existing jdt preferences files in favor of auto-generation.

* removed .springBeans from .gitignore; this file should be
  source-controlled for consistency and convenience.

* removed illegal @Override annotations.  Eclipse/STS now catch these
  properly!
2010-11-11 10:04:20 -08:00
Mark Fisher
35c767a93b INT-1586 added 'receive-timeout', 'recovery-interval', and 'idle-consumer-limit' attributes 2010-11-11 09:31:47 -05:00
Chris Beams
bd3b0222f3 Add Bundle-Version and placeholder to all Bundlor templates 2010-11-09 10:33:14 -08:00
Dave Syer
222cd88bac Clean up .settings 2010-11-09 09:24:58 +00:00
Mark Fisher
cfb378ab4f removed unused imports in tests 2010-11-05 18:34:58 -04:00
Chris Beams
2a215e778b Remove illegal @Override annotations 2010-11-04 16:52:33 -06:00
Chris Beams
e7a4364762 Remove .classpath and .project files
Run `gradle eclipse` to generate prior to import into Eclipse.
2010-10-29 01:37:29 -04:00
Chris Beams
0d55f086bc Eliminate Maven POMs
POMs removed in favor of Gradle build. pom.xml added to .gitignore
to accommodate future generation of source-level poms for those who
wish to use m2eclipse tooling in STS (to come in a later commit)
2010-10-28 15:32:26 -04:00
Mark Fisher
1e9c3c6a8d INT-1528 IntegrationNamespaceUtils.parseInnerHandlerDefinition(..) no longer registers the inner bean definition. Relatedly, all polling inbound adapter parsers now return BeanMetadataElement rather than a pre-registered bean's name (flexibility: RuntimeBeanReference, BeanDefintion, etc.) 2010-10-28 15:32:20 -04:00
Mark Fisher
e8da488033 INT-1526 updating template.mf files for minimum version of Spring 3.0.5 2010-10-23 12:56:13 -05:00
Mark Fisher
c521fc9531 INT-813 added support for configurable 'receive-timeout' on JMS channels 2010-09-23 18:23:39 -04:00
Mark Fisher
c05e5db50a INT-813 added tests for PollableJmsChannels 2010-09-23 17:49:11 -04:00
Mark Fisher
39e293d4ab INT-965 added support for 'interceptors' as a sub-element of JMS channel and publish-subcribe-channel elements 2010-09-23 17:05:15 -04:00
Mark Fisher
6cde5c6d83 INT-965 JmsChannelParser now extends AbstractChannelParser to support interceptors 2010-09-23 16:19:05 -04:00
Oleg Zhurakousky
32efbae90d INT-1263, more MessageHistory changes FTP, SFTP etc. 2010-09-23 09:45:01 -04:00
Oleg Zhurakousky
47befb16f3 Merge branch 'master' of git.springsource.org:spring-integration/spring-integration 2010-09-23 07:56:30 -04:00
Mark Fisher
55d9366c4b INT-813, INT-965 refactoring JmsDestinationBackedMessageChannel into SubscribableJmsChannel and PollableJmsChannel with a common FactoryBean for creation 2010-09-22 23:49:39 -04:00
Oleg Zhurakousky
0be4d2ef60 INT-1263, more MessageHistory related changes 2010-09-22 22:18:45 -04:00
Mark Fisher
be49b854a3 simplified error message 2010-09-22 14:01:15 -04:00
Mark Fisher
3c5917dad6 fixed typo in error message 2010-09-22 10:42:28 -04:00
Oleg Zhurakousky
dee91f6871 INT-1472, reveresed application of 'extractRequestPayload' and 'extractReplyPayload' attributes, changed javadocs, added test as well as minor modification to ChannelPublishingMessageListener to deal with RuntimeException (e.t., NotSerializable) during heneration of the JMS Reply 2010-09-22 10:20:25 -04:00
Oleg Zhurakousky
0d387756b3 INT-1257, changed convinience method to MessageHistory.containsComponent(string), added/modified tests in XML, WS, JMS to validate MessageHistory 2010-09-21 17:21:50 -04:00
Mark Fisher
965b51d2a6 INT-1363 JmsOutboundChannelAdapterParser now allows a JmsTemplate reference along with a Destination or destinationName (but the latter 2 are still mutually exclusive) 2010-09-13 18:07:38 -04:00
Mark Fisher
bf0da16684 INT-1363 JmsDestinationPollingSource no longer extends from AbstractJmsTemplateBasedAdapter 2010-09-13 17:54:50 -04:00
Mark Fisher
44b6490cda INT-1363 JmsSendingMessageHandler no longer extends from AbstractJmsTemplateBasedAdapter 2010-09-13 17:30:27 -04:00
Mark Fisher
01cf5cfc18 INT-1363 separating Destination/destinationName from JmsTemplate configuration 2010-09-13 16:50:46 -04:00
Mark Fisher
3109a78105 INT-1447 raising an error if any JmsTemplate attributes are set when an explicit 'jms-template' reference is also specified 2010-09-13 16:01:59 -04:00
Mark Fisher
62f80d822b removed System.out.println calls from tests 2010-09-13 15:18:42 -04:00
Mark Fisher
4db74cd558 INT-1440 the QoS properties are now only applied to JmsTemplate if it is not a referenced bean 2010-09-13 15:06:25 -04:00
Mark Fisher
f7bca5e9ba INT-1440 the QoS properties are now only applied to JmsTemplate if it is not a referenced bean 2010-09-13 15:05:10 -04:00
Chris Beams
2d88bdd2e8 Increment versions to 2.0.0.BUILD-SNAPSHOT 2010-09-03 20:12:54 +00:00
Chris Beams
f4efc62ca7 Increment versions to 2.0.0.M7 2010-09-03 18:23:12 +00:00
Mark Fisher
2f5dc0c202 INT-1306 renamed AbstractMessagingGateway to MessagingGatewaySupport 2010-09-03 04:02:49 +00:00
Mark Fisher
ef865521f8 JmsSendingMessageHandler only writes history when enabled (implements TrackableComponent) 2010-09-02 20:54:54 +00:00
Mark Fisher
01e3ae539b INT-1410 SoucePollingChannelAdapter retrieves the componentType from its underlying MessageSource if that MessageSource is also a NamedComponent. 2010-09-02 20:40:20 +00:00
Chris Beams
2c17719313 Introduce Maven release:update-versions plugin (INT-1320)
- Upgrade to version 2.0 of the maven-release-plugin in order to
  get the new 'update-versions' goal, which allows for doing nothing
  other than updating pom versions - no tagging, no checkins, etc.

- Accommodate idiosyncracies of the plugin. When running for the first
  time, it became clear that update-versions not only updates versions
  as advertised, but also formats certain elements of the pom.
  Committing just those format changes now so that future actual version
  updates will not have to deal with this uninvited 'help'.

- How to run the command:

  mvn --batch-mode release:update-versions -DdevelopmentVersion=2.0.0.M7

  This will edit the <version> elements in the poms of the projects listed
  in the root pom's <modules> section.
2010-09-02 15:57:05 +00:00
Chris Beams
41e8194239 Revert update to 3.0.4 (INT-1293) due to SpEL issue (SPR-7519)
Upon updating to 3.0.4 the build fails with SpEL error code EL1004E when
executing test method shouldFindSimpleAggregatorMethodWithArray().
Reverting for now, but SPR-7519 has been created for tracking what
appears to be a minor SpEL regression.

- template.mf files now declare range [3.0.3, 4.0.0) for all Spring dependencies

- pom.xml files reverted to dependence on 3.0.3.RELEASE
2010-09-02 12:42:23 +00:00