Commit Graph

46 Commits

Author SHA1 Message Date
Artem Bilan
f3d3f4ee4b INT-2998: Channel Adapters' Lifecycle Refactoring
* Add XSD attributeGroup `smartLifeCycleAttributeGroup`
* Use it for all adapters tags
* Refactoring `AbstractChannelAdapterParser` hierarchy
* Refactoring some `MessageHandler`'s that should not have `autoStartup` & `phase`.
    It is the responsibility of `AbstrctEndpoint`
* Polishing some tests according new logic

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

INT-2998: Polishing

Polishing

 - Reformat schemas where indentation changed
 - Add SLC to the UDP inbound adapter
2013-09-23 17:58:58 -04:00
Gary Russell
00cb16ec21 INT-2996 Fix Class and Package Cycles
INT-2996 Fix Package Cycle

Move interface ...store.MetadataStore to ...store.metadata.

INT-2996 Fix Class Tangle

TcpConnectionEvent incorrectly referenced the
concrete TcpConnectionSupport instead of TcpConnection.
2013-04-16 19:10:48 -04:00
Gunnar Hillert
0271acaf4c INT-2916 - Upgrade to JUnit 4.11 in support of JDK7
For reference see: https://jira.springsource.org/browse/INT-2916

Changes:

* INT-2919 - Upgrade Spring Data Gemfire to 1.2.2.RELEASE
* Exclude Hamcrest transitive dependency from JUnit (as already explicitly declared)
* Set sourceCompatibility in build.gradle to 1.6
* Set targetCompatibility in build.gradle to 1.6
* Upgrade Hamcrest to 1.3 and fix deprications
  - Corematcher is(*class) change to is(instanceOf(*class))
  - Change org.junit.internal.matchers.TypeSafeMatcher to org.hamcrest.TypeSafeMatcher
  - Change import org.junit.matchers.JUnitMatchers.containsString to org.hamcrest.CoreMatchers.containsString
  - Change import org.junit.matchers.JUnitMatchers.both to org.hamcrest.CoreMatchers.both
  - Change import org.junit.matchers.JUnitMatchers.containsString to org.hamcrest.CoreMatchers.containsString
* Fix JUnit deprecations
  - changed junit.framework.Assert to org.junit.Assert
* Add few missing licenses headers to tests
* Marked several test classes with: @DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
  - SplitterIntegrationTests
  - GatewayInvokingMessageHandlerTests
  - FileToChannelIntegrationTests
  - FileInboundChannelAdapterWithRecursiveDirectoryTests
  - JdbcMessageStoreChannelTests
  - ChatMessageInboundChannelAdapterParserTests
* 3 Tests ignored (Still needs to be addressed):
  - testOperationOnPrototypeBean
  - testFailOperationWithCustomScope
  - testOperationOfControlBus
* Update SQL script (test-failure):
  - spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
  - add drop table statements
  - add ignore-failures="DROPS" to "jdbcOutboundChannelAdapterCommonConfig.xml"

INT-2916 - Code Review Changes

INT-2916 - Fix ignored Tests

Fix 3 previously ignored tests in *GroovyControlBusTests*:

* testOperationOnPrototypeBean
* testFailOperationWithCustomScope
* testOperationOfControlBus

INT-2916 - CI Build Testing

INT-2963 - Remove JDK7 Compilation Warnings

* Upgrade Mockito to 1.9.5
* Fix failing SubscribableJmsChannelTests

INT-2916 - Standardize Hamcrest assertions
Ensure Hamcrest assertions are standardized to: is(instanceOf(...))
2013-04-04 13:40:46 -04:00
Gary Russell
451beb424a INT-2873 Create 3.0 Schemas
Copy schemas, cleanup whitespace, update spring.schemas files,
update version in AbstractIntegrationNamespaceHandler.

For each schema compared the 2.2 version with the 3.0 version
(diff -w), ensuring the only difference is the import of
3.0 schemas (where appropriate) instead of 2.2.
2013-01-25 16:12:00 -05: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
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
ca89573209 INT-2400 More Invalid Class Names in Schemas
File, Feed, Ftp, Redis
2012-01-14 10:56:15 -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
Mark Fisher
260116349c removed xsd versions in feed module 2011-10-10 10:56:40 -04:00
Mark Fisher
40ce263281 fixed tests that had multiple triggers 2011-09-27 17:22:07 -04:00
Mark Fisher
7c5603fe83 INT-2092 update schema imports to use 2.1 version 2011-08-31 05:26:02 -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
1803d73547 INT-1676 added spring.tooling and .gif icons for adapters that were missing these files 2010-12-10 10:41:54 -05:00
Oleg Zhurakousky
5c0f1ebb66 INT-1552 fixed schema docs for XMPP, added FEED schema docs 2010-11-22 11:34:49 -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
Oleg Zhurakousky
12b9fb5d91 INT-1560 added documentation for Feed Adapter. Removed dead code from Feed adapter 2010-11-10 13:13:34 -05:00
Mark Fisher
43aa08958a avoiding chance of NPE with feed entry publishedDate 2010-11-05 11:24:22 -04:00
Mark Fisher
a5aa8b9757 moved the FeedEntryMessageSource into the 'inbound' package, and general polishing 2010-11-05 10:46:45 -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
f3fc86395f INT-1527 updated test config for MetadataStore moves 2010-10-28 15:32:20 -04:00
Mark Fisher
5c3a2185a3 INT-1527 moved MetadataStore from 'context.metadata' to 'store' 2010-10-28 15:32:20 -04:00
Mark Fisher
562f4d3dd1 minor javadoc change 2010-10-28 15:32:19 -04:00
Oleg Zhurakousky
274be8b296 polishing 2010-10-28 15:32:19 -04:00
Oleg Zhurakousky
178272162f INT-786 polishing, javadoc 2010-10-28 15:32:19 -04:00
Mark Fisher
0e507932c5 INT-786 moved FileUrlFeedFetcher to the src/test tree and refactored FeedEntryMessageSource to accept a custom FeedFetcher reference 2010-10-28 15:32:18 -04:00
Mark Fisher
93a044f56d INT-786 metadataKey no longer REQUIRES a componentName, but a WARN-level message is logged if a name is not set 2010-10-28 15:32:18 -04:00
Mark Fisher
375c4634f6 INT-786 renamed FeedMessageSourceBeanDefinitionParserTests to FeedInboundChannelAdapterParserTests (and all associated config files) 2010-10-28 15:32:18 -04:00
Mark Fisher
1a4f170d2c INT-786 refactored Feed MessageSource and related classes 2010-10-28 15:32:17 -04:00
Mark Fisher
1dd39728c3 INT-786 renamed 'feed-url' attribute to just 'url' since it's already clear that it's the FEED adapter 2010-10-28 15:32:17 -04:00
Mark Fisher
c865234727 formatting 2010-10-28 15:32:17 -04:00
Mark Fisher
e0f58623f3 formatting 2010-10-28 15:32:17 -04:00
Mark Fisher
b347d2844a polishing 2010-10-28 15:32:17 -04:00
Mark Fisher
4a4b213bd4 polishing 2010-10-28 15:32:16 -04:00
Mark Fisher
7d981b439e added comment 2010-10-28 15:32:16 -04:00
Mark Fisher
7412bc239c INT-1527 MetadataStore refactoring 2010-10-26 18:39:52 -04:00
Oleg Zhurakousky
01da99eff2 INT-1527, INT-786, polished FileBasedPropertiesStore, added 'baseDirectory' property, added tests 2010-10-18 08:22:54 -04:00
Oleg Zhurakousky
5b6583dfe6 INT-786, fixed the directory path in the tests 2010-10-17 23:25:37 -04:00
Oleg Zhurakousky
c60b464b0e INT-786, fixed schema to remove camelCase attribute 'feedUrl', adjusted test cases 2010-10-17 23:20:35 -04:00
Oleg Zhurakousky
bf81955686 INT-786, added namespace support for metadata-support strategy and tests 2010-10-17 22:57:11 -04:00
Oleg Zhurakousky
3bf404cc2a INT-1527, INT-786 refactoread and renamed MetadataPersister to MetadataSore strategy, provided a very simple file-based implementation as FileBasedPropertiesStore which ises DefaultPropertiesPersister, modified FEED module to depend on it 2010-10-17 22:35:35 -04:00
Oleg Zhurakousky
9563fbe915 INT-786, added missing files 2010-10-17 19:07:43 -04:00
Oleg Zhurakousky
31b3a8c0e6 INT-786, added persistence to the feed adapter, added more tests, polished more code 2010-10-17 19:02:39 -04:00
Oleg Zhurakousky
59c525a490 INT-786, more refactoring and tests, added FileUrlFeedFetcher which will allow feed URLs to be specified as file:// (mainly for testing) 2010-10-17 10:06:24 -04:00
Oleg Zhurakousky
3c5218ec67 INT-786 initial cleanup, removed MetaPersister in favor of injecting a Map which could be anything (e.g., cache etc.) 2010-10-16 08:03:00 -04:00
Josh Long
75093c93b3 added a working feed adapter that also maintains state using the metadata persister mechanism. INT-786 2010-10-03 19:14:19 -07:00