Author: ningjiang
Date: Mon Mar 25 15:11:59 2013
New Revision: 1460712
URL: http://svn.apache.org/r1460712
Log:
CAMEL-6179 Fixed the issue that Simple expression in spring XML doesn't work if
it comes in multiple xml lines with thanks to Othman
Merged revisions 1460266 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1460266 | ningjiang | 2013-03-24 14:54:08 +0800 (Sun, 24 Mar 2013) | 1 line
CAMEL-6179 Fixed the issue that Simple expression in spring XML doesn't work
if it comes in multiple xml lines with thanks to Othman
........
Added:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWhiteSpaceTest.java
- copied unchanged from r1460266,
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWhiteSpaceTest.java
camel/branches/camel-2.10.x/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
- copied unchanged from r1460266,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleMultiLineExpressionTest.xml
- copied unchanged from r1460266,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleMultiLineExpressionTest.xml
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
camel/branches/camel-2.10.x/components/camel-jms/ (props changed)
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1460266
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java?rev=1460712&r1=1460711&r2=1460712&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
Mon Mar 25 15:11:59 2013
@@ -34,6 +34,9 @@ public final class SimpleTokenizer {
static {
// add known tokens
KNOWN_TOKENS.add(new SimpleTokenType(TokenType.whiteSpace, " "));
+ KNOWN_TOKENS.add(new SimpleTokenType(TokenType.whiteSpace, "\t"));
+ KNOWN_TOKENS.add(new SimpleTokenType(TokenType.whiteSpace, "\n"));
+ KNOWN_TOKENS.add(new SimpleTokenType(TokenType.whiteSpace, "\r"));
KNOWN_TOKENS.add(new SimpleTokenType(TokenType.singleQuote, "'"));
KNOWN_TOKENS.add(new SimpleTokenType(TokenType.doubleQuote, "\""));
KNOWN_TOKENS.add(new SimpleTokenType(TokenType.functionStart, "${"));
Propchange: camel/branches/camel-2.10.x/components/camel-jms/
------------------------------------------------------------------------------
Merged /camel/trunk/components/camel-jms:r1460266
