svn commit: r881842 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java test/java/org/apache/tapestry5/dom/DOMTest.java

[thiagohp]

Author: thiagohp
Date: Wed Nov 18 17:30:12 2009
New Revision: 881842

URL: http://svn.apache.org/viewvc?rev=881842&view=rev
Log:
Applied patch provided by https://issues.apache.org/jira/browse/TAP5-714. 
Thanks Ciaran Wood!

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
    
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java?rev=881842&r1=881841&r2=881842&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/AbstractMarkupModel.java
 Wed Nov 18 17:30:12 2009
@@ -133,7 +133,8 @@
 
                     if (useApostropheForAttributes)
                     {
-                        builder.append("'");
+                        //TAP5-714
+                        builder.append("'");
                         continue;
                     }
 

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java?rev=881842&r1=881841&r2=881842&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
 Wed Nov 18 17:30:12 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());