svn commit: r882961 - in /tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src: main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java test/java/org/apache/tapestry5/dom/DOMTest.java

[drobiazko]

Author: drobiazko
Date: Sat Nov 21 18:34:59 2009
New Revision: 882961

URL: http://svn.apache.org/viewvc?rev=882961&view=rev
Log:
TAP5-714: Incorrect encoding of single quotes for Ajax requests

Modified:
    
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
    
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java

Modified: 
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java?rev=882961&r1=882960&r2=882961&view=diff
==============================================================================
--- 
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
 (original)
+++ 
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
 Sat Nov 21 18:34:59 2009
@@ -133,7 +133,8 @@
 
                     if (useApostropheForAttributes)
                     {
-                        builder.append("'");
+                        //TAP5-714
+                        builder.append("'");
                         continue;
                     }
 

Modified: 
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java?rev=882961&r1=882960&r2=882961&view=diff
==============================================================================
--- 
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
 (original)
+++ 
tapestry/tapestry5/branches/5.1.0.x-dev/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
 Sat Nov 21 18:34:59 2009
@@ -444,6 +444,17 @@
     }
 
     @Test
+    public void apostrophes_are_escaped() {
+        Document d = new Document(new XMLMarkupModel(true));
+
+        Element root = d.newRootElement("prime");
+
+        root.attribute("apostrophie", "some'thing");
+
+        assertEquals(root.toString(), "<prime apostrophie='some&#39;thing'/>");
+    }
+
+    @Test
     public void add_class_names()
     {
         Document d = new Document(new XMLMarkupModel());