Commit Graph

131 Commits

Author SHA1 Message Date
Gary Russell
066eb91100 INT-1849/INT-2147 Add Disposition to File Adapter
* Add *disposition-expression* to the inbound file adapter. This allows for operations such as *payload.delete()*, *payload.renameTo()* after the file is processed.
* The result of executing the expression (if any) is sent to the disposition-result-channel.
2012-06-25 11:38:20 -04:00
Gunnar Hillert
0269de0f98 INT-2564 Move Some SocketTestUtils to Test Module
Move SocketTestUtils.findAvailableServerSocket to Test Module

For reference see: https://jira.springsource.org/browse/INT-2564

* Move SocketTestUtils.findAvailableServerSocket to Spring Integration Test Module
* Fix tests
2012-06-21 12:35:22 -04:00
Gunnar Hillert
121018190f INT-805 - Dynamically create directories
Dynamically create directories with file:outbound-channel-adapter

* add **directory-expression** attribute for File Outbound Channel Adapter and File Outbound Gateway
* add JUnit tests

For reference: https://jira.springsource.org/browse/INT-805

INT-805 Code Review

* Fixed Spelling
* Fixed Code Convention issues
* Add support for expressions that resolve to File
* Add more JUnit tests

INT-805 - Code Review Changes

* Combine destinationDirectoryExpression and destinationDirectory
* Fix Tests

INT-805 - Code Review

* Always apply *destination directory* validation for each message (including LiteralExpressions)

INT-805 - Code Review changes

INT-805 - Added 2 exclusions to .gitignore
2012-06-15 11:28:53 -04:00
Oleg Zhurakousky
a1e59442d1 INT-2593 Upgrade to Spring WS 2.1.0
Upgrade spring-integration-ws to use Spring WS 2.1.0;
fix the deprecation warning in AbstractWebServiceOutboundGateway.encodeUri(..) method

INT-2593 polishing,
put deprecated code back in to ensure SPR 3.0 compatibility
2012-06-04 18:24:11 -04:00
Gunnar Hillert
7a5b49275f INT-2271 - Add Dynamic Stored Proc Names (SpEL + Header)
* Add support for Stored Procedure/Function Names via Message Header
* Add support for Stored Procedure/Function Names via "stored-procedure-expression" parameter
* Add support for cacheable *SimpleJdbcCallOperation* instances
* Add Guava dependency for Cache Support
* Convert white-spaces to tabs (where occurring)
* Convert line-delimiters to Linux format (where occurring)

For reference see: https://jira.springsource.org/browse/INT-2271

INT-2271 - Expose Cache Stats via JMX
This includes the implementation of INT-2584 - Instantiate the StoredProcExecutor as a Spring Managed Bean for each Stored Procedure Component

INT-2271 Made DataSource final in StoredProcExecutor

INT-2271 - Code Review Changes

INT-2271 Code Review Fixes
* remove attribute *allowDynamicStoredProcedureNames*
* remove JDBC Headers

INT-2271 Polishing

Use LiteralExpression when a simple stored procedure
name is supplied.
2012-06-01 15:13:05 -04:00
Artem Bilan
74b4638eb9 INT-2567: Improvement & refactor Groovy component
Introduce VariableResolver, BeanFilter, FilteredBeanFactoryDecorator, GroovyVariableResolverBinding, refactoring ManagedBeansScriptVariableGenerator for usage GroovyVariableResolverBinding.
GroovyVariableResolverBindingTests.
additional tests for GroovyControlBus.
add 'spring-web' dependency for tests about 'request' custom scope.
Manual: change description about 'Groovy Control Bus' scripts limitation'.

INT-2567: Improve & refacror Groovy Control Bus

Introduce separate BindingOverwriteGroovyObjectCustomizerDecorator
Internal GroovyControlBusFactoryBean$ManagedBeansBinding with delegation to provided BeanFactory
Inline ScriptVariableGenerator implementation just for Message 'headers' variable
Tests for new GroovyScriptPayloadMessageProcessor logic about binding
Integration tests for managed beans in the custom scope
Reference Manual: polishing description about Control Bus' behavior

INT-2567 polishing added @link to javadocs
2012-06-01 10:59:39 -04:00
Gary Russell
d06154bdbc INT-2591 Upgrade spring-amqp to 1.1.1.RELEASE 2012-05-31 15:03:51 -04:00
David Turanski
6dd48eff60 INT-2550,INT-2552:added support for properties regionName and region to GemfireMessageStore
INT-2555:Upgraded to spring-data-gemfire 1.1.1.RELEASE

document update

INT-2550,INT-2552: updated GemfireMessageStore, test, and docs per Oleg's comments

removed setRegion
2012-05-15 13:09:28 -04:00
Gary Russell
11e5fe0c0c INT-2394 Support HA (Mirrored) Queues
Changes to Connection Factory interface (stub).

INT-2394 Polishing

INT-2394 Map Gateway Correlation Header

Map spring_reply_correlation if present.

INT-2394 Map ReplyTo Stack

Enable the use outbound-gateway in a destination application
to which we sent a message using another outbound gateway.

The RabbitTemplate now pushed exising correlation data onto
a stacked header attribute.

INT-2509 Publisher Confirms and Returns

Add Publisher Confirm support to the outbound channel
adapter.

Add returns support to outbound channel adapter and gateway.

INT-2509 Polishing

PR Review comments.

Docs.

Fix chain test after rebase.
2012-05-14 18:09:59 -04:00
Amol Nayak
16f48a12e6 INT-1983 - Add JPA Adapter
For reference see: https://jira.springsource.org/browse/INT-1983

* INT-2435 - Add the ability to automatically resolve the entity-class from the payload as fallback
* Add <transactional/> support for **Jpa Outbound Gateway** and **Jpa Outbound Channel Adapter**
* Merging Documentation from: https://github.com/amolnayak311/spring-integration/blob/INT-2440/src/reference/docbook/jpa.xml
* Provide JPA Tests against Hibernate, EclipseLink and OpenJPA
* Improve Documentation
* Remove trailing white-space, convert white-space to tabs, remove @transactional from DefaultJpaOperations
* INT-2440 Adding the documentation for the JPA adapters

INT-1983 - Code Review based Fixes
* Fix indentation in XML Schema
* Remove *transactional* sub-element definition from JPA Inbound Channel Adapter in XML Schema
* Fix enumeration *gatewayType*

INT-1983 - Based on Code Review

* Remove '/** {@inheritDoc} */' from DefaultJpaOperations
* Remove JavaDoc parameters that don't contains details
* Cleanup *JpaUtils*
* Remove "transaction-manager-ref" from *spring-integration-jpa-2.2.xsd*
* Cleanup *spring-integration-jpa-2.2.xsd*
* Provide documentation to *EclipseLinkJpaOperationsTests* on how to run tests in IDE
* Provide documentation to *OpenJpaJpaOperationsTests* on how to run tests in IDE
* Refactor JPA Reference Doc Chapter (work in progress)

INT-1983 - Code Review: provide better JavaDoc
2012-05-14 13:12:06 -04:00
Gunnar Hillert
4f88297de1 INT-2545 - Upgrade bundlor-plugin + docbook-reference-plugin
* Upgrade bundlor-plugin version to 0.1.2
* Upgrade docbook-reference-plugin to 0.1.5
2012-05-10 08:29:38 -04:00
Oleg Zhurakousky
840a907668 INT-2437 upgraded mongo to 1.1.0.M1 2012-05-08 12:51:36 -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
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
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
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
Gunnar Hillert
3e030cd4bc INT-2468 - Fix DocBook <ulink/> PDF Problems
* upgrade the Docbook Reference plugin dependency from version **0.1.2-SNAPSHOT** to **0.1.3**
* change any occurrences (only the external links):

from

    <link href="http://www.eaipatterns.com/StoreInLibrary.html">Claim Check</link>

to

    <ulink url="http://www.eaipatterns.com/StoreInLibrary.html">Claim Check</ulink>
2012-03-23 10:55:11 -04:00
Oleg Zhurakousky
86527f8dd9 INT-2420 fixed com.mongodb Import-Package to reflect unbounded lower range 2012-03-20 12:14:10 -04:00
Gary Russell
48ae843304 Revert "INT-2437 upgraded spring-data-mongo to 1.0.1"
This reverts commit 2ddf1d7a33.
2012-03-08 12:31:58 -05:00
Oleg Zhurakousky
2ddf1d7a33 INT-2437 upgraded spring-data-mongo to 1.0.1 2012-02-15 12:15:11 -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
Gary Russell
af8180446a INT-2408 Add Spring Project Nature with Gradle
STS needs Spring Project Nature to get classpath XSD/Namespace resolution.
When switching back and forth between 2.0 and 2.1, ./gradlew eclipse
removes Spring Project Nature.

It is now added by ./gradlew eclipse when generating eclipse metadata
files.
2012-01-23 10:15:47 -05:00
Gunnar Hillert
92c974d443 INT-2393 Add Sonar Support (Gradle Plugin)
INT-2393 - Changes in Build.gradle based on Code Review
* Changed line to *jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=org.springframework.integration.*"*
* Added *props["sonar.jacoco.reportPath"] = "${buildDirName}/jacoco.exec" to make build work with default build directory*
* Therefore able to remove: *buildDir = "target"*
* Moved *sonar* block to bottom of build script
* Added comments around the **configurations** block
* Switched to use Gradle Properties instead of System Properties for Sonar parameters

INT-2393 - rootProject.hasProperty works
* More simplifications after finding out that **rootProject.hasProperty** works inside the Sonar closure

INT-2393 Based on code review: Fixed build.gradle
Based on Code Review, converted println statement to logger.info in build.gradle
2012-01-23 10:01:12 -05:00
Chris Beams
55f23932b4 Improve api doc generation
- Touch up title text
 - Add 'header' (shows up in upper right and left of frameset)
 - Ensure @author attribution shows up (not true by default!)
 - Remove now-obsolete custom Javadoc CSS and background image
2012-01-23 09:57:38 -05:00
Chris Beams
f0e8bf10a9 Upgrade to Gradle 1.0-milestone-8 snapshot
Picks up changes that solve intermittent tests described at
http://issues.gradle.org/browse/GRADLE-2035

Also uses new snapshot versions of bundlor and docbook plugins that fix
incompatibility problems with 1.0-milestone-8.
2012-01-23 09:57:38 -05:00
Oleg Zhurakousky
33fb666bdd Updated build.gradle with new upper range for org.apache.commons.net
Updated build.gradle with new upper range for org.apache.commons.net
2012-01-06 16:02:29 -05:00
Chris Beams
dc2550fa0c Upgrade docbook and bundlor plugins to 0.1.1
Picks up minor changes allowing 'reference' and 'docbook' plugins
to show up in `gradle tasks` listings.
2012-01-06 19:37:04 +01:00
Kenneth Bowen
e48afc5a36 Add 'group' and 'Description' to the 'reference' task.
'./gradlew tasks' did not output a description of the reference task.
Add a description of the task to the documentation group.
2012-01-06 12:35:27 -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
Oleg Zhurakousky
c39eb005b6 INT-2357
upgraded XMPP to Smack 3.2.1

The changes in teh tests are due to changes in the underlying API where
XMPPConnection now exposes the configuration properties.
2012-01-05 09:49:09 -05:00
Gunnar Hillert
4d81e649ba INT-2356 - Update Jackson to 1.9.2
For reference see: https://jira.springsource.org/browse/INT-2356
2012-01-04 15:07:46 -05:00
Gary Russell
65fa5358e7 INT-2355 Update Mockito to 1.9.0 2012-01-04 12:05:48 -05:00
Oleg Zhurakousky
11c8c2656c INT-2353 upgraded scripting and groovy module to Groovy 1.8.5 2012-01-04 10:59:11 -05:00
Gunnar Hillert
0c376dd694 INT-2339 - Make spring-tx an explicit dependency
for the Spring Integration MongoDb Module

Also addresses: https://jira.springsource.org/browse/INT-2340

For reference see: https://jira.springsource.org/browse/INT-2339
2011-12-23 10:39:23 -05:00
Mark Fisher
bc09b0617c INT-2229 upgraded spring-data-mongodb dep to 1.0 GA 2011-12-22 15:35:36 -05:00
Mark Fisher
21c727b6fe INT-2329 upgrading to Spring 3.0.7 2011-12-22 15:27:53 -05:00
Gunnar Hillert
1b0e4f2984 INT-2330 - Upgrade to Apache commons-net 3.0.1
For reference see: https://jira.springsource.org/browse/INT-2330
2011-12-22 12:32:05 -05:00
Mark Fisher
df0e6bd51b excluding spring deps from mongo module 2011-12-20 14:52:31 -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
d1367e06d2 INT-2305 2011-12-19 17:03:51 -05:00
Mark Fisher
ddcec56703 INT-2303
upgraded spring-social-twitter to 1.0.1.RELEASE
2011-12-15 15:36:48 -05:00
Mark Fisher
86655c96ef INT-2309
upgrading spring-data-redis dependency to 1.0.0.RELEASE
2011-12-14 18:10:57 -05:00
Mark Fisher
edccd216e0 INT-2308
upgrading spring-gemfire dependency to 1.1.0.RELEASE

  updated pom
2011-12-14 17:57:54 -05:00
Mark Fisher
2fc4abfaed refactored test code for compatibility with Spring Security 3.1
updated pom
2011-12-12 16:12:44 -05:00
Mark Fisher
081bf15c00 upgrading spring-data-gemfire dep to 1.1.0.RC1 2011-12-09 10:04:25 -05:00
Mark Fisher
cf03b10966 INT-2281 reverting spring-security upgrade since some refactoring is required 2011-12-09 09:44:36 -05:00
Mark Fisher
ada2a08678 INT-2281 upgrading to Spring Security 3.1.0 2011-12-09 09:13:21 -05:00
Mark Fisher
71d64da0cb INT-2229 upgraded spring-data-mongodb dep to 1.0.0.RC1 2011-12-09 08:46:16 -05:00
Oleg Zhurakousky
1368bb119f INT-2267, INT-2286
removed unnecessary dependencies
2011-11-29 16:56:47 -05:00
Oleg Zhurakousky
3d8fbe0eed INT-2283
upgraded SFTP module to JSCH v0.1.45
2011-11-29 11:47:58 -05:00