Commit Graph

7448 Commits

Author SHA1 Message Date
Oleg Zhurakousky
7177764a64 Merge pull request #414 from garyrussell/INT-2536
* INT-2536:
  INT-2536 Create 2.2 Schemas
2012-05-04 10:05:11 -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
fae49aa593 Merge pull request #413 from garyrussell/INT-2535
* INT-2535:
  INT-2535 Update Version to 2.2.0.BUILD-SNAPSHOT
2012-05-04 08:58:52 -04:00
Gary Russell
87666d7d8e INT-2535 Update Version to 2.2.0.BUILD-SNAPSHOT
Also update bundlor version ranges for
SI and SF.
2012-05-04 08:57:48 -04:00
Oleg Zhurakousky
bfa55cbf58 Merge pull request #417 from garyrussell/INT-2472
* INT-2472:
  INT-2472 Capture Forked Stderr in Tests
2012-05-04 08:36:56 -04:00
Gary Russell
c3c7a984a4 INT-2472 Capture Forked Stderr in Tests
Previously, ForkUtil only captured stdout from the forked
process.

Now both stdout and stderr are captured and echoed to
the corresponding PrintStream of the calling process.

Also removed the 200ms delay between each stdout line
captured.
2012-05-01 17:09:39 -04:00
Gary Russell
14921e7598 Merge pull request #416 from artembilan/INT-2533a 2012-05-01 16:29:15 -04:00
Artem Bilan
476bdb00e0 INT-2533: polishing 2012-05-01 16:28:14 -04:00
Gary Russell
b6a113f331 Merge pull request #410 from artembilan/INT-2533 2012-04-26 12:39:46 -04:00
Artem Bilan
428bd46165 INT-2533:GF/ForkUtil fix for -cp with whitespaces 2012-04-26 12:38:47 -04:00
Gary Russell
fd3fa99dc8 Merge pull request #408 from ghillert/INT-2517 2012-04-26 11:42:34 -04:00
Gunnar Hillert
027b03af87 INT-2517 - Upgrade to Spring 3.1
* Update **build.gradle** and change the *springVersion* property to **3.1.1.RELEASE**
* Due to change in Spring 3.1, add missing method **getRawStatusCode()** in *org.springframework.integration.http.outbound.CookieTests*
2012-04-21 02:29:42 -04:00
Gary Russell
e0871ff6ce Merge pull request #402 from ghillert/INT-2512 2012-04-19 12:44:47 -04:00
Gunnar Hillert
0eae03025e INT-2512 - Upgrade to Gradle 1.0-rc-1
* Upgrade Gradle Wrapper
* Remove deprecation warnings
* Fix Sonar Build

Depends on: https://github.com/SpringSource/gradle-plugins/pull/1

INT-2512 - Improve declaration of optional and provided dependencies

INT-2512 - Reverted Bundlor Plugin Version Number.
With that change the Spring Integration specific part of the code changes is decoupled from the Bundlor pull request:

https://github.com/SpringSource/gradle-plugins/pull/1
.
Once the Bundlor plugin is updated and released, I can bump the version number (Only then, though all deprecation warnings will be gone).

INT-2512 - Code Review

**Do we really want to add mavenlocal() permanently? I usually add it locally when I need it**

Sorry my bad. Forgot to remove my local addition.

**snapshot?**

The Bundlor plugin relies on Snapshot releases for the Gradle plugin (I reverted the DocBook version).

**mixed leading tabs and spaces**

Removed every single leading space. Unfortunately, there were lots of spaces. Took a while. I hope this looks much better.

**Why are we removing this? Don't we need a local install any more?**

The Maven install logic is now handled by the customized/extended "maven" plugin in **publish-maven.gradle**. This is how Chris has set it up for the Spring Framework.

INT-2512 - Remove mavenLocal()

Change 'build/jacoco.exec' to '${buildDir.name}/jacoco.exec'.
2012-04-19 12:36:10 -04:00
Oleg Zhurakousky
ee9f7fb69c Merge pull request #400 from garyrussell/INT-2493a
* INT-2493a:
  INT-2493 Fix Failing Tests
2012-04-09 15:35:20 -04:00
Gary Russell
3ad32c7f63 INT-2493 Fix Failing Tests
After tightening the edit for no Filters on Get, two tests
failed that were incorrectly checking the filter was set.
2012-04-09 10:30:06 -04:00
Oleg Zhurakousky
0b015830d3 Merge pull request #399 from garyrussell/INT-2493
* INT-2493:
  INT-2493 Add Edit For Filter on Get
2012-04-09 09:35:21 -04:00
Gary Russell
b317ece4c8 INT-2493 Add Edit For Filter on Get
Previously, the Filter property was ignored for a Get
command; this adds a hard edit to ensure a filter is
not provided when this command is used.
2012-04-09 09:34:14 -04:00
Oleg Zhurakousky
6dca78a624 Merge pull request #398 from garyrussell/INT-2494
* INT-2494:
  INT-2494 Move listNames() Method to Session
2012-04-09 09:29:10 -04:00
Gary Russell
00a71eefd2 INT-2494 Move listNames() Method to Session
ExtendedSession, with the listNames() method was introduced
in 2.1.1 (INT-2492) to support mget commands on the gateway.

This was to avoid breaking any user implementations of Session
in a point release. However, we documented this was temporary
and the interfaces would be consolidated in 2.2., and
ExtendedSession would be removed.

This is that consolidation.
2012-04-06 16:35:17 -04:00
Spring Buildmaster
1ba24f7bb6 2012-04-05 04:50:49 -07:00
Spring Buildmaster
5734a5f736 Release version 2.1.1.RELEASE 2012-04-05 04:50:44 -07:00
Oleg Zhurakousky
aec1467b6b INT-2434 lower-cased ChannelInitializer bean name 2012-04-04 14:27:58 -04:00
Gary Russell
d1d4a182b4 Merge pull request #395 from olegz/INT-2496 2012-03-30 14:56:45 -04:00
Oleg Zhurakousky
554468517e INT-2496 GemFire Schema Documentation
Fix Gemfire schema to eliminate reference to a file adapter. Added schemadoc for error-channel while at it
2012-03-30 14:55:34 -04:00
Gary Russell
e847342852 Merge pull request #360 from olegz/INT-2434-v3 2012-03-30 14:43: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
93c0f6592d Merge pull request #396 from olegz/INT-2490 2012-03-30 14:12:38 -04:00
Oleg Zhurakousky
bdab73499d INT-2490 (S)FTP Documentation
Add (S)FTP documentation about how to disable renaming of the files during transfer
2012-03-30 14:10:37 -04:00
Oleg Zhurakousky
d117b59006 Merge pull request #368 from ghillert/INT-2446
* INT-2446:
  INT-2446 - Twitter: Allow unauthorized operations * also improve test code coverage
2012-03-30 09:50:25 -04:00
Gunnar Hillert
d0b08474fd INT-2446 - Twitter: Allow unauthorized operations
* also improve test code coverage
2012-03-30 09:49:23 -04:00
Oleg Zhurakousky
8c3c4a0e1f Merge pull request #394 from garyrussell/INT-2451
* INT-2451:
  Combined commit from Gary and Mark for INT-2451 Added bean resolver to ContentEnricher INT-2451 Polishing - PR Review Comments
2012-03-29 18:34:46 -04:00
Mark Fisher
a77e5dac5a Combined commit from Gary and Mark for INT-2451
Added bean resolver to ContentEnricher
INT-2451 Polishing - PR Review Comments

Disallow bean resolution in the name expression for content enricher
properties - the name expressions can only resolve to payload
properties. Value expressions can resolve to beans and bean properties.
2012-03-29 18:32:30 -04:00
Gary Russell
1d392e6ab2 Merge pull request #380 from olegz/INT-2479 2012-03-29 15:50:45 -04:00
Oleg Zhurakousky
a37c7a0821 INT-2479 UUID Header Conversion
Refactored MongoDbMessageStore to ensure that the Message metadata is persisted consistently using already provided converters. Major refactoring went into MessageWrapper and MongoDbMessageStore.write method which was greatly simplified based on the fact that MessageWrapper now represents the structure that needs to be persisted

INT-2479
fixed default converters to make sure that UUID is stored in Mongo with type information, so the actuall UUID type could be restored
2012-03-29 15:48:16 -04:00
Gary Russell
2df1240220 Merge pull request #393 from olegz/INT-2502-patch 2012-03-29 11:22:47 -04:00
Oleg Zhurakousky
5952934171 INT-2502-patch Tighten Mask Validation
Polishing and add tests.
2012-03-29 11:19:17 -04:00
Gary Russell
3356712796 Merge pull request #390 from olegz/INT-2502 2012-03-28 18:56:48 -04:00
Oleg Zhurakousky
4375cd9c8c INT-2502, INT-1117 Improve Group Locking
Add initial support for Global lock registry. Fix race condition described in INT-2502.

INT-2502 addressed PR comments by @garyrussell

INT-2502 polishing
2012-03-28 18:44:24 -04:00
Gary Russell
f5908ec876 Merge pull request #386 from digitalsanctum/INT-2477 2012-03-27 15:57:25 -04:00
Shane Witbeck
175bc8554c INT-2477 allow control encoding to be set
INT-2477 added tests

Polishing - Spring Standard tabs Vs. spaces, formatting
2012-03-27 15:55:57 -04:00
Gary Russell
6975da83da Merge pull request #348 from olegz/INT-2396 2012-03-27 15:30:29 -04:00
Oleg Zhurakousky
fc31317aa4 INT-2396 Fix 'expression' Attribute Parsing
Ensure that 'expression*' attributes are parsed
by the AggregatorParser when 'ref' is used to
define the actual aggregator

INT-2396 polishing based on PR comments

INT-2396 changed parser error to warning
message as suggested by Mark.
Raised follow up JIRA for 2.2 to fix it back to error
2012-03-27 15:23:17 -04:00
Gary Russell
6bb460d825 Merge pull request #389 from olegz/INT-2478a 2012-03-27 14:46:30 -04:00
Oleg Zhurakousky
5fd15d11e0 INT-2478a polished the test that broke the build 2012-03-27 14:13:58 -04:00
Gary Russell
a48f2512da Merge pull request #388 from olegz/INT-2489 2012-03-27 14:10:27 -04:00
David Turanski
4740f1cf32 INT-2489:allow for empty temporaryFileSuffix
INT-2498:Added use-temporary-file-name to (s)ftp outbound adapters

INT-2489 polished parser to eliminate any value validation

INT-2489 removed trailing whitespaces from schema files

INT-2489 added boolean flag to detect if 'temporaryFileSuffix'
was explicitly set so the warning message is only be displayed
if renaming is turned off, but a suffix provided.

INT-2489 polishing
2012-03-27 14:10:00 -04:00
Gary Russell
ec6ad79fba Merge pull request #381 from olegz/INT-2475 2012-03-27 13:22:23 -04:00
Oleg Zhurakousky
3ef9177248 INT-2475 Fix WS Gateway Result Payload
Fixed the return value of a non-SOAP message to return the extracted result as is, added tests

INT-2475 polishing based on PR comments

INT-2475 added POX tests for DomSource and Document as per PR suggestion
2012-03-27 13:20:21 -04:00
Gary Russell
2eb3fa3783 Merge pull request #383 from olegz/INT-2478 2012-03-27 11:43:42 -04:00