You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2009/01/27 03:10:49 UTC

svn commit: r737972 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry5/dom/ test/java/org/apache/tapestry5/dom/ test/resources/org/apache/tapestry5/dom/

Author: hlship
Date: Tue Jan 27 02:10:49 2009
New Revision: 737972

URL: http://svn.apache.org/viewvc?rev=737972&view=rev
Log:
TAP5-457: Illegal prefix for XML namespace

Added:
    tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/defaults_for_xml_defined_namespaces.txt
Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.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/Document.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java?rev=737972&r1=737971&r2=737972&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java Tue Jan 27 02:10:49 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 package org.apache.tapestry5.dom;
 
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 import org.apache.tapestry5.ioc.internal.util.Defense;
 
 import java.io.PrintWriter;
@@ -25,6 +26,16 @@
  */
 public final class Document extends Node
 {
+    /**
+     * XML Namespace URI.  May be bound to the "xml" but must not be bound to any other prefix.
+     */
+    public static final String XML_NAMESPACE_URI = "http://www.w3.org/XML/1998/namespace";
+
+    /**
+     * Namespace used exclusively for defining namespaces.
+     */
+    public static final String XMLNS_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
+
     private Element rootElement;
 
     private DTD dtd;
@@ -134,7 +145,10 @@
             dtd.toMarkup(writer);
         }
 
-        Map<String, String> initialNamespaceMap = Collections.emptyMap();
+        Map<String, String> initialNamespaceMap = CollectionFactory.newMap();
+
+        initialNamespaceMap.put("xml", "http://www.w3.org/XML/1998/namespace");
+        initialNamespaceMap.put("xmlns", "http://www.w3.org/2000/xmlns/");
 
         rootElement.toMarkup(document, writer, initialNamespaceMap);
     }
@@ -171,7 +185,10 @@
     @Override
     protected Map<String, String> getNamespaceURIToPrefix()
     {
-        if (rootElement == null) return Collections.emptyMap();
+        if (rootElement == null)
+        {
+            return Collections.emptyMap();
+        }
 
         return rootElement.getNamespaceURIToPrefix();
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java?rev=737972&r1=737971&r2=737972&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java Tue Jan 27 02:10:49 2009
@@ -315,6 +315,8 @@
 
         for (String namespace : namespaces)
         {
+            if (namespace.equals(Document.XML_NAMESPACE_URI)) continue;
+
             String prefix = namespaceToPrefix.get(namespace);
 
             builder.append(" xmlns");
@@ -362,6 +364,8 @@
     {
         if (namespace == null || namespace.equals("")) return name;
 
+        if (namespace.equals(Document.XML_NAMESPACE_URI)) return "xml:" + name;
+
         String prefix = namespaceURIToPrefix.get(namespace);
 
         // This should never happen, because namespaces are automatically defined as needed.
@@ -513,6 +517,12 @@
         Defense.notNull(namespace, "namespace");
         Defense.notNull(namespacePrefix, "namespacePrefix");
 
+        // Don't allow an override of the XML namespace URI, per
+        // http://www.w3.org/TR/2006/REC-xml-names-20060816/#xmlReserved
+
+        if (namespace.equals(Document.XML_NAMESPACE_URI))
+            return this;
+
         if (namespaceToPrefix == null)
             namespaceToPrefix = CollectionFactory.newMap();
 

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=737972&r1=737971&r2=737972&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 Tue Jan 27 02:10:49 2009
@@ -714,4 +714,23 @@
 
         assertFalse(child.isEmpty());
     }
+
+    /**
+     * TAP5-457
+     */
+    @Test
+    public void defaults_for_xml_defined_namespaces() throws Exception
+    {
+        Document d = new Document();
+
+        String XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
+
+        Element root = d.newRootElement(XHTML_NAMESPACE, "html");
+
+        root.attribute(Document.XML_NAMESPACE_URI, "lang", "de");
+
+        // Before TAP5-457, it would be ns0: not xml:
+
+        assertEquals(d.toString(), readFile("defaults_for_xml_defined_namespaces.txt"));
+    }
 }

Added: tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/defaults_for_xml_defined_namespaces.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/defaults_for_xml_defined_namespaces.txt?rev=737972&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/defaults_for_xml_defined_namespaces.txt (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/defaults_for_xml_defined_namespaces.txt Tue Jan 27 02:10:49 2009
@@ -0,0 +1 @@
+<html xml:lang="de" xmlns="http://www.w3.org/1999/xhtml"></html>
\ No newline at end of file