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

[joshcanfield]

Author: joshcanfield
Date: Mon Feb 21 20:12:52 2011
New Revision: 1073127

URL: http://svn.apache.org/viewvc?rev=1073127&view=rev
Log:
TAP5-1040 - integrated patch to allow no system or public id in doctype

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.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/DTD.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java?rev=1073127&r1=1073126&r2=1073127&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java
 Mon Feb 21 20:12:52 2011
@@ -52,5 +52,9 @@ public class DTD
         {
             writer.printf("<!DOCTYPE %s SYSTEM \"%s\">", name, systemId);
         }
+        else
+        {
+            writer.printf("<!DOCTYPE %s>", name);
+        }
     }
 }

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=1073127&r1=1073126&r2=1073127&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
 Mon Feb 21 20:12:52 2011
@@ -435,7 +435,7 @@ public class DOMTest extends InternalBas
         Document d = new Document(new XMLMarkupModel());
         d.newRootElement("prime");
         d.dtd("prime", null, null);
-        assertEquals(d.toString(), "<?xml version=\"1.0\"?>\n<prime/>");
+        assertEquals(d.toString(), "<?xml version=\"1.0\"?>\n<!DOCTYPE 
prime><prime/>");
         d.dtd("prime", "-//TF", null);
         assertEquals(d.toString(), "<?xml version=\"1.0\"?>\n<!DOCTYPE prime 
PUBLIC \"-//TF\"><prime/>");