svn commit: r1331911 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/support/ camel-core/src/test/java/org/apache/camel/language/

[davsclaus]

Author: davsclaus
Date: Sun Apr 29 13:36:10 2012
New Revision: 1331911

URL: http://svn.apache.org/viewvc?rev=1331911&view=rev
Log:
CAMEL-5212: Fixed tokenize XML with inherit namepace from parent, issue if 
namespaces is in multiline.

Added:
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java
      - copied unchanged from r1331910, 
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceMultilineSplitTest.java
      - copied unchanged from r1331910, 
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceMultilineSplitTest.java
Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1331910

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java?rev=1331911&r1=1331910&r2=1331911&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
 Sun Apr 29 13:36:10 2012
@@ -88,7 +88,8 @@ public class TokenXMLPairExpressionItera
             this.inheritNamespaceToken = inheritNamespaceToken;
             if (inheritNamespaceToken != null) {
                 token = inheritNamespaceToken.substring(0, 
inheritNamespaceToken.length() - 1) + SCAN_TOKEN_REGEX;
-                this.inheritNamespaceTokenPattern = Pattern.compile(token);
+                // the namespaces on the parent tag can be in multi line, so 
we need to instruct the dot to support multilines
+                this.inheritNamespaceTokenPattern = Pattern.compile(token, 
Pattern.MULTILINE | Pattern.DOTALL);
             }
         }
 

Modified: 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java?rev=1331911&r1=1331910&r2=1331911&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
 Sun Apr 29 13:36:10 2012
@@ -45,7 +45,7 @@ public class TokenXMLPairNamespaceSplitT
         assertMockEndpointsSatisfied();
     }
 
-    private String createBody() {
+    protected String createBody() {
         StringBuilder sb = new StringBuilder("<?xml version=\"1.0\"?>\n");
         sb.append("<orders xmlns=\"http:acme.com\">\n");
         sb.append("  <order id=\"1\">Camel in Action</order>\n");