Author: nbelaevski Date: 2008-07-29 18:32:17 -0400 (Tue, 29 Jul 2008) New Revision: 9819 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToHTMLStream.java Log: https://jira.jboss.org/jira/browse/RF-3607 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2008-07-29 15:06:03 UTC (rev 9818) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2008-07-29 22:32:17 UTC (rev 9819) @@ -360,14 +360,14 @@ // <title> or <base> in the head if (!("title".equalsIgnoreCase(element.rawname) || "base" .equalsIgnoreCase(element.rawname))) { - insertResources(); + insertResources(element.prefix, element.uri); } } else { if (!haveHtml) { insertStartElement("html"); } insertStartElement("head"); - insertResources(); + insertResources(element.prefix, element.uri); insertEndElement("head"); } @@ -411,12 +411,12 @@ } } if (!headParsed && "head".equalsIgnoreCase(element.rawname)) { - insertResources(); + insertResources(element.prefix, element.uri); } super.endElement(element, augs); } - private void insertResources() { + private void insertResources(String prefix, String uri) { headParsed = true; if (headEvents != null && headEvents.length > 0) { @@ -429,14 +429,15 @@ SAXStartElementEvent startElementEvent = (SAXStartElementEvent) event; String elementName = startElementEvent.getName(); - QName element = new QName(null, elementName, elementName, null); + QName element = new QName(prefix, elementName, elementName, uri); stack.add(element); XMLAttributes attrs = new XMLAttributesImpl(); for (Map.Entry<String, String> entry : startElementEvent.getAttributes().entrySet()) { + String name = entry.getKey(); String value = entry.getValue(); - attrs.addAttribute(new QName(null, name, name, null), "CDATA", value); + attrs.addAttribute(new QName(prefix, name, name, uri), "CDATA", value); } if (depth++ == 0) { @@ -483,12 +484,12 @@ // <title> or <base> in the head if (!("title".equalsIgnoreCase(name.rawname) || "base" .equalsIgnoreCase(name.rawname))) { - insertResources(); + insertResources(name.prefix, name.uri); } } else if ("head".equalsIgnoreCase(name.rawname)) { haveHead = true; super.startElement(name, attributes, augmentation); - insertResources(); + insertResources(name.prefix, name.uri); insertEndElement(name.rawname); return; } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToHTMLStream.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToHTMLStream.java 2008-07-29 15:06:03 UTC (rev 9818) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToHTMLStream.java 2008-07-29 22:32:17 UTC (rev 9819) @@ -51,6 +51,8 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import static org.ajax4jsf.xml.serializer.ToXHTMLStream.*; + /** * This serializer takes a series of SAX or * SAX-like events and writes its output @@ -799,7 +801,7 @@ // if this element has a namespace then treat it like XML - if (null != namespaceURI && namespaceURI.length() > 0) + if (null != namespaceURI && namespaceURI.length() > 0 && (!XHTML_NAMESPACE_URI.equals(namespaceURI))) { super.startElement(namespaceURI, localName, name, atts); @@ -913,7 +915,7 @@ closeCDATA(); // if the element has a namespace, treat it like XML, not HTML - if (null != namespaceURI && namespaceURI.length() > 0) + if (null != namespaceURI && namespaceURI.length() > 0 && (!XHTML_NAMESPACE_URI.equals(namespaceURI))) { super.endElement(namespaceURI, localName, name);