Commit Graph

117 Commits

Author SHA1 Message Date
Oleg Zhurakousky
835d8ff77a INT-2318
removed pre-initialization of MBeanExporter form IntegrationMBeanExporter since its no longer required
2012-06-01 11:52:19 -04:00
Artem Bilan
45c429ee2b INT-2275: any outbound-channel-adapter in <chain>
Add re-init logic for nested chains
Add logic about nested element for AbstractChannelAdapterParser
Refactor of DefaultOutboundChannelAdapterParser
Test for non-last nested chain with some outbound-channel-adapter
Improve XSD for chain-type
Manual outbound-channel-adapter ability for chain
Integration tests for all outbound-channel-adapter within <chain>
Remove redundant 'return-value-required' attribute from <stored-proc-outbound-channel-adapter>
Add support 'expectReply' for FileWritingMessageHandler

INT-2275 polishing & refactor FileOutbound*Parser

HttpRequestExecutingMessageHandlerTests polishing

INT-2275: polishing JavaDoc
2012-05-14 12:41:39 -04:00
Gary Russell
0a12a496cc INT-2485 Orderly Shutdown
Initial commit - @ManagedOperation on IMBE

- can be invoked via JMX, <control-bus/>, or getting a reference to
the IMBE from the application context.

INT-2485 Updates After Review Comments (JIRA)

* Shutdown Schedulers first, and wait for them
* Add a force parameter, which overrides thread pool shutdown options
* Shutdown Sources/Channels after all thread pools have stopped
* Mark other components as OrderlyShutdownCapable (e.g. JMS/AMQP Listener containers) and shut them down first
* Wait for remaining time to allow for quiescence

Also
* remove TimeUnit parameter (not JMX-friendly); time limit is now always milliseconds
* If thread pools don't stop in time limit, force them down.

INT-2485 Handle Self-Destruction

Add shutdown-executor to IMBE.

When the shutdown was called on a Spring-Managed thread, the shutdown
was not clean because we timed out waiting for the current thread to
terminate. After that, we force terminated other components.

Now, by providing a dedicated Executor for the shutdown process, it
is used for the shutdown instead of the current thread. This Executor
is *not* shutdown.

It is not necessary to provide an Executor if the stopActiveComponents()
method is called on some other thread that is not involved in the
shutdown.

Also adds executor name to logs, when available.

INT-2485 Polishing

Fix MBean object name collision when running all tests.

INT-2485 Enable TCP Shutdown

Make TCP connection factories 'OrderlyShutdownCapable' so
they are stopped before schedulers/executors in order for
them to release any executor threads they are holding.

INT-2485 Polishing

Didn't need DirectFieldAccessor - scheduler and executor have
an accessor for the native ExecutorService.

Copyrights

INT-2485 Polishing

schemaLocation version.

INT-2485 PR Review Polishing
2012-05-10 08:10:00 -04:00
Gary Russell
95cd202be6 INT-2536 Create 2.2 Schemas
Add 2.2 versions of module schemas.

JMX is already covered by an existing pull request.

INT-2536 Schema Check

Bump version for schema check in
AbstractIntegrationNamespaceHandler.

INT-2536 Remove Schema Versions

Some test config files had 2.1 versioned schemas.
2012-05-04 10:04:01 -04:00
Oleg Zhurakousky
458eac43da INT-2434 Fix How input-channels are auto-created
Channel creation logic for channels that are not explicitly defined but identified via an 'input-channel' attribute on the corresponding endpoint is now done by ChannelInitializer - an InitializingBean implementation.

This bean plays a role of pre-instantiator since it is instantiated and initialized as the very first bean of all SI beans using AbstractIntegrationNamespaceHandler

INT-2434-v3 polishing

INT-2434-v3 polishing, changed ChannelCreatingFactoryBean from BeanFactoryPostProcessor to BeanFactoryAware

INT-2434 polishing

fix the test

changed the default name of the CHANNEL_CREATOR_BEAN_NAME to a simple name

added additional test

changed ChannelCreatingFactoryBean from FactoryBean to InitializingBean and renamed it to ChannelInitializer

INT-2434 added test validating how automatic channel creation can be disabled

INT-2434 polished based on the latest PR comments

INT-2434-v3 polishing based on comments and discussions with @markfisher and @garyrussell. Added support for disabling aut-creatioin of channels

INT-2434-v3 polished based on @garyrussell last comments

INT-2434-v3 final polishing
2012-03-30 14:40:22 -04: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
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
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
Gary Russell
89cdef7a90 INT-2373 package-info JMX
INT-2374 package-info Mail

INT-2375 package-info MongoDB

INT-2376 package-info Redis

INT-2377 package-info RMI

INT-2379 package-info Security

INT-2381 package-info Stream
2012-01-05 15:29:48 -05:00
Oleg Zhurakousky
03754b917a INT-2307
fixed NPE due to the missing class name from BeanDefinition
2011-12-20 16:23:14 -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
Mark Fisher
5805528faa removing warnings 2011-12-19 16:38:48 -05:00
Gary Russell
cfc37616e5 INT-2313 Avoid Naming Conflicts With Mutliple Ctx
If multiple application contexts exist in the same JVM, where
managed beans exist with the same name, InstanceAlreadyExistsExceptions
could result.

1. Change int-jmx MBean exporter parser to ensure the exporter itself
has a unique name within the JVM.
2. When the IMBE exports Integration components for monitoring, where
the component itself is already an MBean, add domain and object name
static properties configured in the MBean exporter.
3. Add tests to load the same ac a second time to ensure no naming
conflicts arise.
2011-12-19 12:42:16 -05:00
Oleg Zhurakousky
1a56747a8a INT-2307
added MBeanExporterHelper to avoid conflicts with core MBeanExporter

INT-2307 polishing

INT-2307 polishing
2011-12-19 12:42:16 -05:00
Artem Bilan
869bcd5d36 INT-2188 and INT-2165
add fail test for HeaderEnricherSupport

  more flexible and readable parsing for sub-elements of <si:header>
2011-11-10 16:59:43 -05:00
Oleg Zhurakousky
99369c90d2 JMX_test_fix 2011-10-25 12:44:52 -05:00
Oleg Zhurakousky
ddeab16394 INT-2182 interim
INT-2182 interim

INT-2182 work in progress

INT-2182 Refctored MessageGroupQueue and related classes
- created MGS.pollMessageFromGroup(groupId)
- removed MARKED messages concept
- renamed UNMARKED to just Messages
- removed keepReleasedMessages attribute
- refactored JdbcMessageStore to NOT store Messages that belong to a MessageGroup in the MessageGroup table, only relationship
- provided implementation of pollMessageFromGroup method in JdbcMessageStore
- polished tests

INT-2182 refactored MongoDB support to reflect changes to MGQ

INT-2182 added Gemfire support for polling

INT-2182 added Redis support

INT-2182 polishing
removed syncronized blocks from SMG, added availablePermits() method to UpperBound, polished JdbcMessageStore

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing based on PR comments
2011-10-25 12:50:17 -04:00
Mark Fisher
23c566898b versionless schemas for jmx module 2011-10-10 13:21:04 -04:00
Mark Fisher
7c5603fe83 INT-2092 update schema imports to use 2.1 version 2011-08-31 05:26:02 -04:00
Gary Russell
82f1cbc715 INT-1884 Fix Intermittent Test Failure
The test is verifying at least one more poll is executed after capturing
the initial poll count. However we only did one receive and relying on
luck that another poll happened in the interim. Changed to do 2 receives.
2011-08-13 13:45:03 -04:00
Gary Russell
56cefae41d INT-2040 Broken JMX Test
The change to a long return value for MessageCount broke a JMX test
(expected Integer got Long)
2011-08-13 11:04:54 -04:00
Oleg Zhurakousky
935cd01d07 INT-1512 changed the type of ID attribute to be xsd:string in all related 2.1 schema files 2011-08-08 23:34:12 -04:00
Mark Fisher
3e71b5a83b INT-2004 added 2.1 versions of all XML schemas and adjusted spring.schemas files accordingly 2011-08-05 11:07:20 -04:00
Mark Fisher
0b8a8a15c1 simplified exception message 2011-05-06 12:32:39 -04:00
Dave Syer
225f4a3b84 INT-1806: fix duplicate MBeans 2011-05-04 17:54:58 +01:00
Dave Syer
2150b9b806 INT-1789: fix test for Java 5 (duh) 2011-05-03 17:28:53 +01:00
Dave Syer
fdc5862e44 INT-1789: clarify docs in XSD 2011-05-03 17:11:16 +01:00
Dave Syer
41a8307266 INT-1789: Added 'managed-components' attribute to mbean-export 2011-05-03 17:06:06 +01:00
Oleg Zhurakousky
ea469ca887 INT-1817 polishing 2011-05-03 10:22:09 -04:00
Oleg Zhurakousky
3956193bea INT-1817 changed attribute value from 'object-name-static-properties-ref' to 'object-name-static-properties' 2011-05-03 10:16:33 -04:00
Dave Syer
3441971540 INT-1806: added ManagedEndpoint for endpoints that are not message sources or message handlers 2011-05-03 10:04:15 +01:00
Dave Syer
9ae8180bcf INT-1830: add tests and workaround for MBeanExporters triggering eager loading 2011-03-10 16:09:01 +00:00
Oleg Zhurakousky
f82c40fd3a INT-1816 chahnged NotificationPublishingMessageHandler to select the IntegrationMBeanExporter over MBeanExporter if available 2011-03-10 10:28:08 -05:00
Oleg Zhurakousky
de8ff948e7 INT-1816 chahnged NotificationPublishingMessageHandler to select the first available MBeanExporter instance 2011-03-10 10:02:35 -05:00
Oleg Zhurakousky
8b53fa1fc7 INT-1817 added namespace support for object-name-static-properties for IntegrationMBeanExporter 2011-03-09 17:13:13 -05:00
Oleg Zhurakousky
3f06998118 INT-1816 fixed the test to make sure that new MBean server instance is used for different tests, since it was cousing conflicts between the tests 2011-03-09 14:37:54 -05:00
Oleg Zhurakousky
1b3e7ce6e9 INT-1816 added support for multiple non-conflicting mbean exporters 2011-03-09 12:49:04 -05:00
Dave Syer
90946841b4 INT-1820: fix handler metrics 2011-02-28 14:33:13 +00:00
Mark Fisher
9a6d20d5b3 polishing 2010-12-16 16:19:52 -05:00
Dave Syer
ed63431977 INT-1675: add ignored test 2010-12-12 12:13:38 +00:00
Dave Syer
b528abcf68 INT-1675: work a bit harder to expose existing handlers if they are @ManagedResources 2010-12-11 08:49:09 +00:00
Dave Syer
e23e478e9e INT-1675: force initialization of other MBeanExporter instances before the integration monitor components are created 2010-12-11 08:49:08 +00:00
Dave Syer
c293edc7fa INT-1675: add illegal bean id check for clash with core mbean exporter 2010-12-11 08:49:07 +00:00
Mark Fisher
b3547433fb polishing 2010-11-18 23:19:01 -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
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
2b849f6747 removed SimpleMessageMapper, AttributePollingMessageSource now extends AbstractMessageSource 2010-11-12 18:00:49 -05:00
Dave Syer
e617de54c8 INT-1420: add units to metric descriptions 2010-11-12 09:27:13 +00:00
Dave Syer
4b4a6fdb94 Tweak test to defeat slow CI again 2010-11-10 09:26:34 +00:00
Dave Syer
941b1127d1 INT-1561: add counters to message stores 2010-11-10 09:26:34 +00:00