Commit Graph

1223 Commits

Author SHA1 Message Date
Artem Bilan
6c7f7c3eb0 INT-2439 PollerParser adviceChain.add(customBean)
Fix PollerParser#configureAdviceChain for adding 'customBeanDefinition' into 'adviceChain' List.
PollerParserTests: adding <tx:advice> as customElement into poller's <advice-chain>.

Commit is mostly parser tidy-up. The crux of the fix is to add the
missing call to adviceChain.add().
2012-03-13 11:22:54 -04: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
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
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
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
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
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
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
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
Gary Russell
4872876e4f INT-2400 More expected-type Fixes
CollectionFilter in core; package changes in security.
2012-01-13 13:40:40 -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
f30da932e8 INT-2388 Update Gradle build
This is a significant update to the build system, including the changes
listed below. README.md has been updated with instructions on the most
important day-to-day commands.

 - Eliminate buildSrc submodule

   In favor of using the new bundlor and docbook-reference plugins. The
   net effect is a large reduction in number of lines of build code.
   Common docbook resources, stylesheets, etc are stored directly in the
   docbook plugin.

   This means that --recursive is no longer required when cloning and
   there will never be a need to use `git submodule` commands. README
   files have been updated to reflect.

   Use of the new bundlor plugin also means the removal of template.mf
   files from the source tree in favor of an inline approach. See
   build.gradle for details. Bundlor 'import templates' are built up
   programmatically and kept physically close to gradle dependency
   declarations, leading to more convenience when changing these values
   and hopefully fewer errors / version inconsistencies over time.

   Certain tests depended on the presence of template.mf files, all of
   which have recently been removed from the source tree in favor of the
   new bundlor plugin which allows for inlining bundlor configuration
   within the Gradle build script. These tests now create temp files
   using the java.io.File API instead.

 - Upgrade to Gradle 1.0-milestone-6

   The m6 release is significantly faster when resolving dependencies
   and has a number of valuable new features over the earlier m3
   version. Review the release notes for Gradle 1.0-milestone-6 online
   for full details.

 - Switch to repo.springsource.org repository

   Previously the project build declared as many repositories as
   necessary to resolve all project dependencies.

   Now depending on a single 'virtual repository' defined within the
   SpringSource Artifactory instance at http://repo.springsource.org.
   Currently, the virtual repository in use is 'libs-milestone', which
   allows for the resolution of all "milestone-or-better" versions of
   all S2 and third-party dependencies.

   Should snapshot dependencies become required, this value may be
   changed from 'libs-milestone' to 'libs-snapshot'. To build only
   against GA releases, change the value to 'libs-release'.

 - New build plan(s)

   Spring Integration build plans have been updated to use the
   Artifactory Bamboo plugin and publish to repo.springsource.org.
   Build plans have names like 2.1.x to reflect the version under
   development, not necessarily the name of the branch, as this may
   change over time and across major releases.

 - Improve release process

   As mentioned above, Spring Integration will now use the Artifactory
   Bamboo plugin to publish releases and also use Artifactory's support
   for pushing builds directly into Maven Central via oss.sonatype.org.

   Generate poms that contain all necessary fields for onboarding at
   Maven central (scm, developers, organization, licenses, etc).

   Generate -source and -javadoc poms to comply with Maven Central
   onboarding rules (and for general good practice anyway).

   Generation of PGP signatures, sha1 and md5 checksums are all handled
   automatically by Artifactory. These are also requirements for
   automated entry into Maven Central.

 - Remove source-level pom generation

   Automatic generation of Maven poms suitable for use in building
   Spring Integration is no longer supported. Generation and
   publication of poms for the purpose of dependency management remains
   supported.

   Sonar support has to date depended on these poms, but will be
   switched over to use the Gradle Sonar plugin shortly.

 - Eliminate docs subproject

   Move docs/src to the root of the project and eliminate docs as a
   formal subproject. This simplifies the build in a number of ways,
   including removing the need for distinguishing between 'subprojects'
   and 'javaprojects' as well as allowing users to build both 'api' and
   'reference' docs without qualifying with a ':docs' prefix.

   Also rename the src/info directory to src/dist to better reflect that
   these files are packaged with the distribution. For example, the
   readme.txt there is really the distribution readme, distinct from the
   README.md at the root of the project which is for building from source,
   etc.
2012-01-05 17:49:04 -05:00
Gary Russell
b59ee8e352 INT-2369 package-info IP
INT-2360 package-info Core

INT-2361 package-info AMQP

INT-2362 package-info Event

INT-2363 package-info Feed

INT-2364 package-info File

INT-2365 INT-2380 package-info (S)FTP

INT-2366 package-info GemFire

INT-2367 package-info Groovy

INT-2368 package-info Http

INT-2378 package-info Scripting

INT-2372 package-info JMS
2012-01-05 14:42:24 -05:00
Gary Russell
65fa5358e7 INT-2355 Update Mockito to 1.9.0 2012-01-04 12:05:48 -05:00
Gary Russell
5750ca5ff5 INT-2347 Update Channel Mappings Atomically
Ensure consistent state if channel map is replaced
dynamically.
2012-01-03 11:44:13 -05:00
Mark Fisher
f3155f86fa corrected reversed test method names 2012-01-03 11:30:45 -05:00
Gary Russell
85ea4f6411 INT-2342 Add Test Cases 2012-01-03 11:19:52 -05:00
Mark Fisher
ffe132986b INT-2342 2012-01-03 11:17:47 -05:00
Mark Fisher
abe6220e02 Update version to 2.1.0.BUILD-SNAPSHOT 2011-12-23 12:15:13 -05:00
Mark Fisher
e67c115004 Release version 2.1.0.RC2 2011-12-23 12:00:52 -05:00
Mark Fisher
21c727b6fe INT-2329 upgrading to Spring 3.0.7 2011-12-22 15:27:53 -05:00
Oleg Zhurakousky
06bc10e960 INT-2331 fixed aggregator documentation
INT-2331 polishing
2011-12-22 09:09:57 -05:00
Mark Fisher
5fae7d2a1f fixed RouterFactoryBean 2011-12-20 17:41:21 -05:00
Oleg Zhurakousky
dd66c98f61 INT-2319
changed logic behind default group id for QueueChannel to be messageStoreId:channelId

added support for resolving value if it is a placeholder
2011-12-20 14:10:40 -05:00
Oleg Zhurakousky
50e1fddaf5 INT-2321
Handlers within a chain are no longer registered as beans in the context.
2011-12-20 13:58:07 -05:00
Mark Fisher
77abc55a1e INT-2322 2011-12-20 13:18:57 -05:00
Oleg Zhurakousky
a44d150009 INT-2323
made changes based on Sonar suggestions

added optional rome dependency to HTTP module
2011-12-20 12:12:20 -05:00
Artem Bilan
d7851fef5a INT-2316: xsd improve for reply- & error-channels
Now <header-enricher> <reply-channel> & <error-channel> are 'referenceOrValueHeaderType'.
Added tests for 'value' & 'expression' attributes on <reply-channel> element.
2011-12-20 11:13:19 -05:00
Oleg Zhurakousky
86c574e493 INT-2311
modified implementation of MessageGroupQueue to use interruptible locks

Basically modeled it after LinkedBlockingQueue

changed to use ReadWriteLock

refactored MessageGroupQueue and added tests

changed MessageGroupQueue to use Condition

added messageGroupSize(groupId) method to MessageGroupStore and all the implementations

polishing based on Gary's comments

removed setStoreLock method in favor of additional constructors

polishing tests, decreased timeouts

made peek() thread safe

added logging
2011-12-19 19:32:23 -05:00
Mark Fisher
84b94ec5da removed @ManagedResource from AMMR 2011-12-19 16:59:32 -05:00
Mark Fisher
84d590aeae removed suppress deprecation 2011-12-19 16:57:05 -05:00
Mark Fisher
af1d0859d1 un-deprecated setChannelResolver() method
the XSD attribute IS deprecated, but this method is needed internally
2011-12-19 16:29:12 -05:00
Artem Bilan
83700f73f4 INT-2315 headerValueRouter chain mapping minOcc=0
now <header-value-router> doesn't require mapping when it is defined inside <chain>.
Tests for <header-value-router> inside <chain>.
2011-12-19 15:41:01 -05:00
Mark Fisher
6e6e972e35 INT-2291 no longer counting down in failing handler or unexpected handler 2011-12-19 12:08:49 -05:00
Oleg Zhurakousky
8869da7a95 INT-2291
polished MixedDispatcherConfigurationScenarioTests.failoverNoLoadBalancingWithExecutorConcurrent() test even more, introduced 'taskSubmissionMonitor' as CountDownLatch to ensure that shutdown command is not called untill all tasks are submitted. Also made sure that ExecutorChannel is using the same tasks executor so shutdown command actually shuts down the same executor.
2011-12-19 09:22:47 -05:00
Oleg Zhurakousky
22cbe9e0dd INT-2291 polished broken test 2011-12-19 08:58:59 -05:00
Mark Fisher
e5ec1d48b2 INT-2291 temporarily ignoring test 2011-12-16 10:14:05 -05:00
Oleg Zhurakousky
390bf504dd INT-2306 fixed populateUserDefinedHeaders() to account for standard heades 2011-12-15 17:28:54 -05:00
Mark Fisher
2928830868 moved ChannelResolver setter call to configureRouter() method 2011-12-15 17:14:55 -05:00
Oleg Zhurakousky
e2f73ba6be INT-2299 polishing 2011-12-15 17:09:52 -05:00
Oleg Zhurakousky
0a8b348c98 INT-2299
put back 'channel-resolver' attribute with deprecation warnings

INT-2299 polishing

INT-2299 added XPATH test
2011-12-15 17:09:52 -05:00
Oleg Zhurakousky
8587ace344 INT-2295 fixed parser logic to eliminate STS warning
INT-2295 removed dead code
Object source = parserContext.extractSource(element); always returned NULL
2011-12-15 16:10:22 -05:00
Oleg Zhurakousky
18bb156ead INT-2291 polished test 2011-12-15 15:40:05 -05:00
Artem Bilan
8a1614cb00 INT-2288: done ResourceInboundChannelAdapterParserTests independents of OS & @After for remove files in tests 2011-12-14 11:37:39 -05:00
Oleg Zhurakousky
1ffdb19039 INT-2291 fixed failing test 2011-12-01 13:11:12 -05:00
Oleg Zhurakousky
3f6896677f INT-2265
fixed GemfireGroupStoreTests.testMultipleInstancesOfGroupStore() test to avoid intermittent failures

  refactored MessageGroupMetadata to eliminate the usage of TreeMap in favor of LinkedList for storing UUIDs of Messages
2011-11-28 17:30:44 -05:00
Mark Fisher
4417d5d8b0 Update version to 2.1.0.BUILD-SNAPSHOT 2011-11-23 17:33:09 -05:00
Mark Fisher
1001d74ba7 Release version 2.1.0.RC1 2011-11-23 17:20:56 -05:00
Oleg Zhurakousky
34c51eb635 INT-2235-updated
added default filter as AcceptOnceCollectionFilter, chanhged parser to allow filter= to allow null filter
2011-11-23 15:05:32 -05:00