Commit Graph

91 Commits

Author SHA1 Message Date
Chris Beams
536fda2200 Check in Gradle-generated poms for convenience (INT-1609)
For ease of use by those (a) more familiar with Maven or (b) relying
on m2eclipse support within Eclipse/STS, generated poms are now checked
in. Changes to these files will be overwritted on subsequent gradle
builds.

Any changes to project dependencies should first be reflected in
build.gradle; then run `gradle generatePom` or simply `gradle build`
to see the change reflected in the pom(s).

Note that org.springframework.integration.ip.tcp.TcpInboundGatewayTests
currently fails when running `mvn clean test` from the root. This
problem does not manifest when running `gradle clean test`. The latter
is what's most important; Gary has been contacted to take a look at the
former.

Issues resolved:
    INT-1609, INT-1610, INT-1611
2010-11-12 23:27:32 -08: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
Chris Beams
b3f18afdd7 Further reorganization and polish of build script 2010-11-10 08:09:26 -08:00
Dave Syer
941b1127d1 INT-1561: add counters to message stores 2010-11-10 09:26:34 +00:00
Chris Beams
bd3b0222f3 Add Bundle-Version and placeholder to all Bundlor templates 2010-11-09 10:33:14 -08:00
Dave Syer
222cd88bac Clean up .settings 2010-11-09 09:24:58 +00:00
Chris Beams
e7a4364762 Remove .classpath and .project files
Run `gradle eclipse` to generate prior to import into Eclipse.
2010-10-29 01:37:29 -04:00
Chris Beams
0d55f086bc Eliminate Maven POMs
POMs removed in favor of Gradle build. pom.xml added to .gitignore
to accommodate future generation of source-level poms for those who
wish to use m2eclipse tooling in STS (to come in a later commit)
2010-10-28 15:32:26 -04:00
Mark Fisher
d9045e1904 INT-1568 removed '$' prefix for headers. Now there is NO prefix. 2010-10-28 15:32:24 -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
Chris Beams
f54e81d301 Port spring-integration-jdbc db schema generation to Gradle
Before (Maven): http://pastie.org/1253428
After (Gradle): http://pastie.org/1253435

This new task:
- may be run independently with `gradle generateSql`
- is tied to the build lifecycle and will execute prior to 'compileJava'
- writes output to build/generated-resources
- is set up for incremental build -- will not run if the above dir exists
- may be selectively cleaned with `gradle cleanGenerateSql`
2010-10-27 16:27:29 -04:00
Mark Fisher
d0ef062c2e INT-1487 updated some test config references to commons.serializer as well as tooling annotations in schemas 2010-10-22 21:50:09 -05:00
Mark Fisher
180753ca5b INT-1487 now using Spring 3.0.5 core Serializer/Deserializer, INT-1490 import version is now resolved since it's included in 'core' import, and INT-1526 updated the affected template.mf files for 3.0.5 as the minimum (will address others next) 2010-10-22 21:12:22 -05:00
Dave Syer
b37c3923e0 Fix Java 5 compilation problem 2010-10-18 11:49:11 -07:00
Dave Syer
ad044120fc INT-1535: add auto-startup to schema, plus test 2010-10-18 11:36:21 -07:00
Dave Syer
ebbb52237d Fix compiler warnings in JDBC 2010-10-18 07:45:05 -07:00
Dave Syer
6adb950390 INT-1366: Fix race by collapsing 3 queries into 1 2010-10-17 16:56:21 -07:00
Dave Syer
e0dcf08b7e INT-1518: Provide crutch for broken RDBMS (DB2, Derby etc.)
- Externalize storeLock and LockInterceptor utility
- Add tests showing usage of tx interceptor
2010-10-17 16:54:38 -07:00
Mark Fisher
729a37fb62 INT-1486 updated JDBC module for refactored Serialization code 2010-09-28 16:07:00 -04:00
Oleg Zhurakousky
9d07304d05 fixed MessageHistory test 2010-09-23 13:17:12 -04:00
Dave Syer
d1bc9e9b39 INT-1263: fix broken test 2010-09-23 18:55:58 +02:00
Dave Syer
39a887df48 Tidy JDBC inbound poller tests some more 2010-09-23 18:38:54 +02:00
Dave Syer
54ca59a917 Tidy up JDBC inbound poller tests 2010-09-23 18:36:44 +02:00
Oleg Zhurakousky
1bb6eafe04 INT-1263, added tests in FYP to validate MH 2010-09-22 20:46:42 -04:00
Oleg Zhurakousky
b6e058c59b INT-1263, added more changes and tests related valdating MessageHistory in every module 2010-09-22 18:44:51 -04:00
Oleg Zhurakousky
c4d31af848 INT-1257, added tests and minor modification to support MessageHistory in MAIL, JDBC, IP, HTTP modules 2010-09-21 22:15:37 -04:00
Dave Syer
1f6bff9ade INT-1465: fix Jdbc mesasge store 2010-09-18 10:39:15 +01:00
Iwein Fuld
2d5a9dde49 INT-1339: Added support for partial completion for disordered sequences.
- Added markMessageFromGroup to MessageGroup interface
- made ResequencingMessageGroupProcessor return the partial sequence that was processed
- removed obsolete test
- refactored CorrelatingMessageHandler to deal with the partially processed sequence properly

Still it is needed to remove the release-strategy attribute from the namespace to avoid confusion.
2010-09-14 16:58:48 +02:00
Dave Syer
b024ece0fb Fix test (timeout was expected) 2010-09-14 08:33:41 +01:00
Dave Syer
1bef0f8c27 Ignore failing test and add TODO 2010-09-14 08:29:35 +01:00
Dave Syer
df9e8aafc2 Add exception for timeout - easier to read failure in test 2010-09-14 08:03:36 +01:00
Dave Syer
9d22d8abce INT-1347: move sequence details to MessageBuilder so they can be shared by router and splitter 2010-09-10 10:44:25 +01:00
Chris Beams
5fd539ca5b Fix manifests missing spring-commons imports (INT-1427) 2010-09-06 22:03:48 +02:00
Chris Beams
2d88bdd2e8 Increment versions to 2.0.0.BUILD-SNAPSHOT 2010-09-03 20:12:54 +00:00
Chris Beams
f4efc62ca7 Increment versions to 2.0.0.M7 2010-09-03 18:23:12 +00:00
Chris Beams
2c17719313 Introduce Maven release:update-versions plugin (INT-1320)
- Upgrade to version 2.0 of the maven-release-plugin in order to
  get the new 'update-versions' goal, which allows for doing nothing
  other than updating pom versions - no tagging, no checkins, etc.

- Accommodate idiosyncracies of the plugin. When running for the first
  time, it became clear that update-versions not only updates versions
  as advertised, but also formats certain elements of the pom.
  Committing just those format changes now so that future actual version
  updates will not have to deal with this uninvited 'help'.

- How to run the command:

  mvn --batch-mode release:update-versions -DdevelopmentVersion=2.0.0.M7

  This will edit the <version> elements in the poms of the projects listed
  in the root pom's <modules> section.
2010-09-02 15:57:05 +00:00
Chris Beams
41e8194239 Revert update to 3.0.4 (INT-1293) due to SpEL issue (SPR-7519)
Upon updating to 3.0.4 the build fails with SpEL error code EL1004E when
executing test method shouldFindSimpleAggregatorMethodWithArray().
Reverting for now, but SPR-7519 has been created for tracking what
appears to be a minor SpEL regression.

- template.mf files now declare range [3.0.3, 4.0.0) for all Spring dependencies

- pom.xml files reverted to dependence on 3.0.3.RELEASE
2010-09-02 12:42:23 +00:00
Chris Beams
4ded74b317 Update pom and template.mf files Spring 3.0.4 (INT-1293) 2010-09-02 10:54:11 +00:00
Chris Beams
9e6e232837 Disconnect samples from parent pom (INT-1316) 2010-09-02 10:22:53 +00:00
David Syer
b88644b7db INT-1202: add serializer strategy to JDBC message store 2010-09-01 15:11:58 +00:00
David Syer
d2a3c3d5eb INT-1327: add support for JDBC outbound gateway 2010-09-01 14:09:09 +00:00
David Syer
b654e566eb Add gateway to schema 2010-09-01 14:09:02 +00:00
David Syer
93be55d84d INT-1394: add expression parameter source 2010-09-01 14:09:00 +00:00
David Syer
c73cf27dd8 Add extra test for forum question 2010-09-01 14:08:52 +00:00
Oleg Zhurakousky
353b61160f INT-1263, refactored MessageHandlers in several modules to subclass from AbstractMessageHandler to support MessageHistory 2010-08-31 22:56:05 +00:00
Mark Fisher
3b15a0dd38 INT-1390 moved MessageBuilder into the 'support' package, moved GenericMessage and ErrorMessage into the 'message' package 2010-08-31 02:51:27 +00:00
Mark Fisher
7c1ab04cd5 INT-1390 Refactoring: moved MessageChannel to the root package, and moved ChannelResolver and BeanFactoryChannelResolver into a new 'suport.channel' package 2010-08-31 01:53:45 +00:00
Mark Fisher
959241a8e6 INT-1389 removed all dependencies on StringMessage from unit tests in spring-integration-jdbc 2010-08-30 18:54:49 +00:00
David Syer
1de89be40a Add extra integration test for jdbc poller 2010-08-25 20:37:31 +00:00