Author: nbelaevski Date: 2009-12-29 13:02:00 -0500 (Tue, 29 Dec 2009) New Revision: 16222 Modified: root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml Log: https://jira.jboss.org/jira/browse/RF-8235 Modified: root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy =================================================================== --- root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy 2009-12-29 16:53:57 UTC (rev 16221) +++ root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy 2009-12-29 18:02:00 UTC (rev 16222) @@ -37,7 +37,7 @@ SchemaProcessorNamespaceContext() { biMap = HashBiMap.create(); biMap.put("http://www.w3.org/2001/XMLSchema";, "xs"); - biMap.put("http://richfaces.org/cdk-schema-info";, "cdk-schema-info"); + biMap.put("http://richfaces.org/cdk/additional-attributes-info";, "cdk-schema-info"); } @Override Modified: root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd 2009-12-29 16:53:57 UTC (rev 16221) +++ root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema targetNamespace="http://richfaces.org/cdk" elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:cdk="http://richfaces.org/cdk" attributeFormDefault="unqualified"> + xmlns:cdk="http://richfaces.org/cdk/core" attributeFormDefault="unqualified"> <xsd:annotation> <xsd:documentation>$Id$</xsd:documentation> </xsd:annotation> Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java 2009-12-29 16:53:57 UTC (rev 16221) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java 2009-12-29 18:02:00 UTC (rev 16222) @@ -45,7 +45,7 @@ private static final String TEMPLATE_EPILOG = "</cc:implementation></cdk:root>"; private static final String TEMPLATE_MIDDLE = "</cc:interface><cc:implementation>"; - public static final String TEMPLATE_PROLOG = "<cdk:root xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:cdk=\"http://richfaces.org/cdk\" xmlns:c=\"http://java.sun.com/jsp/jstl/core\" xmlns:cc=\"http://java.sun.com/jsf/composite\"><cc:interf...; + public static final String TEMPLATE_PROLOG = "<cdk:root xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:cdk=\"http://richfaces.org/cdk/core\" xmlns:c=\"http://richfaces.org/cdk/jstl/core\" xmlns:cc=\"http://richfaces.org/cdk/jsf/composite\"><cc:i...; private static final Object DEFAULT_ATTRIBUTE_TYPE = Object.class.getName(); @Test Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2009-12-29 16:53:57 UTC (rev 16221) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk" - xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite"> +<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite"> <cc:interface> <cdk:class>org.richfaces.cdk.test.renderkit.rf4_xhtml.TestRenderer</cdk:class> <cdk:superclass>javax.faces.render.Renderer</cdk:superclass> Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml 2009-12-29 16:53:57 UTC (rev 16221) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk" - xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite"> +<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite"> <cc:interface> <cdk:class>org.richfaces.cdk.renderkit.html.TestPanelRenderer</cdk:class> <cdk:superclass>org.richfaces.cdk.renderkit.AbstractTestPanelRenderer</cdk:superclass> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2009-12-29 16:53:57 UTC (rev 16221) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" +<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee"> <cc:interface> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2009-12-29 16:53:57 UTC (rev 16221) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:cc="http://java.sun.com/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee"> +<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:c="http://richfaces.org/cdk/jstl/core" + xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee"> <cc:interface> <cdk:class>org.richfaces.renderkit.html.AjaxFunctionRenderer</cdk:class> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2009-12-29 16:53:57 UTC (rev 16221) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" +<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee"> <cc:interface> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2009-12-29 16:53:57 UTC (rev 16221) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" +<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee"> <cc:interface> Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-12-29 16:53:57 UTC (rev 16221) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-12-29 18:02:00 UTC (rev 16222) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" +<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee"> <cc:interface>