Commit Graph

92 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
bd5a3d190b Merge branch 'buildSrc'
Added 'buildSrc' directory as a git submodule to be shared across
all Spring open-source projects. This eliminates the need to maintain
custom Gradle code within Spring Integration directly.

For a brief introduction to git submodules, see
    http://speirs.org/blog/2009/5/11/understanding-git-submodules.html

And of course the official documentation is at
    http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html
    https://git.wiki.kernel.org/index.php/GitSubmoduleTutorial

Conflicts:
	spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
	spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java
2010-11-11 16:26:53 -08:00
Mark Fisher
c4a760a26d router polishing, minor changes to PayloadTypeRouter algorithm 2010-11-11 15:44:06 -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
Mark Fisher
38aa676cb9 renamed getChannelIndicatorList method to getChannelIdentifiers on AbstractMessageRouter 2010-11-10 08:50:21 -05:00
Chris Beams
bd3b0222f3 Add Bundle-Version and placeholder to all Bundlor templates 2010-11-09 10:33:14 -08:00
Oleg Zhurakousky
1278666ed7 INT-1596, fixed the broken links as well as all warnings 2010-11-09 12:17:45 -05:00
Dave Syer
222cd88bac Clean up .settings 2010-11-09 09:24:58 +00:00
Mark Fisher
d3cfac25fe polishing, also fixed concurrency issue in XsltPayloadTransfomer.buildTransformer() method (assigning rootObject to instance var SpEL EvaluationContext) 2010-11-02 18:33:41 -04:00
Mark Fisher
55941036e4 polishing 2010-11-02 17:41:06 -04:00
Mark Fisher
b3456bf098 polishing 2010-11-02 17:18:27 -04:00
Mark Fisher
3490779396 polishing 2010-11-02 17:03:48 -04:00
Mark Fisher
7c6a53d7ff formatting 2010-11-02 14:45:40 -04:00
Mark Fisher
36dad9371c formatting 2010-11-01 14:36:07 -04:00
Mark Fisher
4e4c4f69ff polishing 2010-11-01 14:17:39 -04: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
e8da488033 INT-1526 updating template.mf files for minimum version of Spring 3.0.5 2010-10-23 12:56:13 -05:00
Oleg Zhurakousky
75d9e701e1 IINT-1515, INT-1519 actually pushing the test for the XmlValidatingMessageSelector 2010-10-16 06:25:44 -04:00
Oleg Zhurakousky
6b18489caa INT-1519, INT-1515, polished XmlValidatingMessageSelector and related parser, added javadocs, assertions, comments, tests 2010-10-15 17:21:16 -04:00
Oleg Zhurakousky
654ded6898 INT-957, polishing, also going back to throwing MessageRejectionException from XmlValidatingMessageSelector 2010-10-14 18:26:06 -04:00
Oleg Zhurakousky
fc51593001 INT-1519, INT-957, INT-1515, Added support for propagating XML Validation exceptions with MessageRejectedException, added support for 'xml-validator' attribute, change XmlValidatingMessageSelector to be bootstrapped with either Resource/Schema or XmlValidator 2010-10-14 14:12:54 -04:00
Oleg Zhurakousky
e738d34535 INT-1519 removed XmlValidator and dependency on it in favor of XmlValidator startegy in Spring 2010-10-14 11:41:08 -04:00
Oleg Zhurakousky
697a939370 INT-1377 merged AbstractRouterParser with AbstractChannelNameResolvingRouterParser, removed AbstractChannelNameResolvingRouterParser, now AbstractRouterParser is the base class for all routers 2010-10-14 07:04:10 -04:00
Oleg Zhurakousky
1d0b773f2b INT-1517, combined Single and Multi channel XPath routers, modified XPathRouterParser to inherit form the base parser for all routers, combine single/multiple xpath router tests into one 2010-10-14 06:45:22 -04:00
Oleg Zhurakousky
3a8444c949 INT-1515, removed @Override on accept method 2010-10-14 06:07:44 -04:00
Oleg Zhurakousky
a389fa9795 INT-1515 initial round of refactoring to turn validating-router into validating-filter 2010-10-14 05:56:19 -04:00
Oleg Zhurakousky
6c053a9e11 INT-1377, added support for dynamics in XML XPath router, added mapping support for XPath router configuration 2010-10-13 16:16:48 -04:00
Oleg Zhurakousky
ecc8b23cf1 INT-1377, merged AbstractSingleChannelNameRouter with AbstractMessageRouter, fixed corresponding tests, removed dependencies on it across the workspace 2010-10-13 11:30:09 -04:00
Oleg Zhurakousky
46e5ef3e14 INT-1506 changed ID from xsd:string to xsd:ID and made it optional in XML module 2010-10-12 07:57:48 -04:00
Oleg Zhurakousky
32efbae90d INT-1263, more MessageHistory changes FTP, SFTP etc. 2010-09-23 09:45:01 -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
0d387756b3 INT-1257, changed convinience method to MessageHistory.containsComponent(string), added/modified tests in XML, WS, JMS to validate MessageHistory 2010-09-21 17:21:50 -04:00
Oleg Zhurakousky
f8b501e4f9 INT-1257, added convinience method MessageHistory.containsEntryWithName(string), added tests in XML to validate MessageHistory 2010-09-21 13:49:46 -04:00
Oleg Zhurakousky
394efd2a2a INT-1438, added XPath transformer documentation 2010-09-15 22:43:41 -04:00
Mark Fisher
8d2b29da4d INT-1453 added support for File-typed payloads in XPath components 2010-09-15 14:24:12 -07: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
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
a5490139e6 INT-1227 parameterized MessageProcessor 2010-08-30 22:56:57 +00:00
Mark Fisher
c5db58ddd7 INT-1389 removed all dependencies on StringMessage from unit tests in spring-integration-xml 2010-08-30 20:49:22 +00:00
Oleg Zhurakousky
dc3c93417d INT-1383, polished code by introducing PayternMatchUtils 2010-08-28 13:36:23 +00:00
Oleg Zhurakousky
6b8ed78ec5 INT-1383, fixed manifest template 2010-08-27 14:42:04 +00:00
Oleg Zhurakousky
12a82618c3 INT-1383 2010-08-27 14:26:50 +00:00