Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a23191c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a23191c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a23191c Branch: refs/heads/master Commit: 6a23191c8a19bfb41087271f9512b7ede01604d4 Parents: fd8bfb6 3e7dbf5 Author: Richard Kettelerij <r.kettele...@avisi.nl> Authored: Mon Mar 17 15:45:37 2014 +0100 Committer: Richard Kettelerij <r.kettele...@avisi.nl> Committed: Mon Mar 17 15:45:37 2014 +0100 ---------------------------------------------------------------------- .../org/apache/camel/builder/SimpleBuilder.java | 6 +- .../camel/language/simple/SimpleLanguage.java | 9 +- .../language/simple/SimplePredicateParser.java | 9 ++ .../simple/SimpleParserPredicateTest.java | 12 +++ .../SimpleRouteExpressionAsPredicateTest.java | 51 +++++++++ .../component/sjms/CamelJmsTestHelper.java | 83 +++++++++++++++ .../consumer/InOutConcurrentConsumerTest.java | 80 ++++++++++++++ .../itest/osgi/OSGiIntegrationTestSupport.java | 2 + .../camel/itest/karaf/org.ops4j.pax.url.mvn.cfg | 103 +++++++++++++++++++ 9 files changed, 347 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
