Author: alexsmirnov Date: 2009-11-17 18:32:18 -0500 (Tue, 17 Nov 2009) New Revision: 15905 Modified: branches/community/3.3.X/framework/impl/pom.xml branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java branches/community/3.3.X/samples/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml Log: https://jira.jboss.org/jira/browse/RF-8036 Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2009-11-17 19:56:37 UTC (rev 15904) +++ branches/community/3.3.X/framework/impl/pom.xml 2009-11-17 23:32:18 UTC (rev 15905) @@ -142,12 +142,30 @@ <optional>true</optional> </dependency> <dependency> - <groupId>nekohtml</groupId> + <groupId>net.sourceforge.nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>0.9.5</version> + <version>1.9.13</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> <version>1.8.1</version> Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2009-11-17 19:56:37 UTC (rev 15904) +++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2009-11-17 23:32:18 UTC (rev 15905) @@ -105,6 +105,7 @@ public void encodeAjax(FacesContext context, UIComponent component) throws IOException { UIComponent root; + AjaxRendererUtils.encodeAjaxBegin(context, component); // Iterate over all childrens, render it if nessesary... log.debug(Messages.getMessage(Messages.RENDER_CHILDREN_AJAX_INFO)); AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); @@ -124,6 +125,7 @@ } // Write information about encoded areas after submission. AjaxRendererUtils.encodeAreas(context, component); + AjaxRendererUtils.encodeAjaxEnd(context, component); } public boolean isParentRendered(UIComponent target) { Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2009-11-17 19:56:37 UTC (rev 15904) +++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2009-11-17 23:32:18 UTC (rev 15905) @@ -364,11 +364,11 @@ } } else { if (!haveHtml) { - insertStartElement("html"); + insertStartElement("html",augs); } - insertStartElement("head"); + insertStartElement("head",augs); insertResources(element.prefix, element.uri); - insertEndElement("head"); + insertEndElement("head",augs); } } @@ -444,7 +444,7 @@ break; case Node.ELEMENT_NODE: - QName name = new QName(prefix, node.getNodeName(), node.getNodeName(), uri); + QName name = new QName("", node.getNodeName(), node.getNodeName(), getNamespace()); XMLAttributes attrs = new XMLAttributesImpl(); NamedNodeMap attributes = node.getAttributes(); @@ -515,7 +515,7 @@ haveHead = true; super.startElement(name, attributes, augmentation); insertResources(name.prefix, name.uri); - insertEndElement(name.rawname); + insertEndElement(name.rawname,augmentation); return; } } @@ -547,17 +547,15 @@ return false; } - void insertStartElement(String name) { - QName element = new QName(null, name, name, null); + void insertStartElement(String name,Augmentations augs) { + QName element = new QName("", name, name, getNamespace()); XMLAttributes attrs = new XMLAttributesImpl(); - Augmentations augs = new HTMLAugmentations(); super.startElement(element, attrs, augs); } - void insertEndElement(String name) { - QName element = new QName(null, name, name, null); + void insertEndElement(String name,Augmentations augs) { + QName element = new QName("", name, name, getNamespace()); // XMLAttributes attrs = new XMLAttributesImpl(); - Augmentations augs = new HTMLAugmentations(); super.endElement(element, augs); } @@ -568,7 +566,7 @@ */ public void endDocument(Augmentations augs) throws XNIException { if (!haveHtml) { - insertEndElement("html"); + insertEndElement("html",augs); } super.endDocument(augs); } @@ -699,10 +697,6 @@ getNamespace()); } - // config - // .setFeature( - // "http://cyberneko.org/html/features/balance-tags/ignore-outside-content", - // true); _config .setFeature( "http://cyberneko.org/html/features/scanner/cdata-sections", @@ -737,6 +731,10 @@ "lower"); _config.setProperty("http://cyberneko.org/html/properties/filters";, _filters); + _config + .setFeature( + "http://cyberneko.org/html/features/balance-tags/document-fragment", + true); } catch (XMLConfigurationException e) { // throw new ServletException("error set Neko feature ", e); } Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-11-17 19:56:37 UTC (rev 15904) +++ branches/community/3.3.X/samples/pom.xml 2009-11-17 23:32:18 UTC (rev 15905) @@ -80,16 +80,16 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>nekohtml</groupId> + <groupId>net.sourceforge.nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>0.9.5</version> - <scope>runtime</scope> + <version>1.9.13</version> <exclusions> <exclusion> - <artifactId>xerces</artifactId> <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> </exclusion> </exclusions> + <scope>runtime</scope> </dependency> </dependencies> <profiles> Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-17 19:56:37 UTC (rev 15904) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-17 23:32:18 UTC (rev 15905) @@ -235,6 +235,12 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.9.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.facelets</groupId> @@ -253,19 +259,19 @@ <version>1.0</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.13</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + <scope>runtime</scope> + </dependency> <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>0.9.5</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>xerces</artifactId> - <groupId>xerces</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version>