Author: nbelaevski Date: 2009-12-29 13:05:21 -0500 (Tue, 29 Dec 2009) New Revision: 16223 Modified: root/cdk/trunk/plugins/generator/pom.xml root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd Log: https://jira.jboss.org/jira/browse/RF-8235 Modified: root/cdk/trunk/plugins/generator/pom.xml =================================================================== --- root/cdk/trunk/plugins/generator/pom.xml 2009-12-29 18:02:00 UTC (rev 16222) +++ root/cdk/trunk/plugins/generator/pom.xml 2009-12-29 18:05:21 UTC (rev 16223) @@ -43,7 +43,7 @@ <configuration> <properties> <sourceSchema>src/main/resources/META-INF/schema/xhtml-el.xsd</sourceSchema> - <targetNamespace>http://richfaces.org/xhtml-el</targetNamespace> + <targetNamespace>http://richfaces.org/cdk/xhtml-el</targetNamespace> <outputFile>META-INF/cdk/attributes/xhtml-el.xml</outputFile> </properties> <classpath> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-29 18:02:00 UTC (rev 16222) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-29 18:05:21 UTC (rev 16223) @@ -116,10 +116,12 @@ private static final Logger LOG = LoggerFactory.getLogger(); + private static final String XHTML_EL_NAMESPACE = "http://richfaces.org/cdk/xhtml-el"; + private static final Set<String> DEFAULT_NAMESPACES = new HashSet<String>(); static { - DEFAULT_NAMESPACES.add("http://richfaces.org/xhtml-el"); + DEFAULT_NAMESPACES.add(XHTML_EL_NAMESPACE); DEFAULT_NAMESPACES.add("http://www.w3.org/1999/xhtml"); } @@ -143,7 +145,7 @@ this.classLoader = classLoader; SchemaSet schemaSet = jaxbBinding.unmarshal("urn:attributes:xhtml-el.xml", null, SchemaSet.class); - this.attributesSchema = schemaSet.getSchemas().get("http://richfaces.org/xhtml-el"); + this.attributesSchema = schemaSet.getSchemas().get(XHTML_EL_NAMESPACE); } private void initializeJavaClass() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2009-12-29 18:02:00 UTC (rev 16222) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2009-12-29 18:05:21 UTC (rev 16223) @@ -34,11 +34,11 @@ @XmlRootElement(name = "root", namespace = Template.CDK_NAMESPACE) public class Template { - public static final String JSTL_CORE_NAMESPACE = "http://java.sun.com/jsp/jstl/core"; + public static final String JSTL_CORE_NAMESPACE = "http://richfaces.org/cdk/jstl/core"; - public static final String CDK_NAMESPACE = "http://richfaces.org/cdk"; + public static final String CDK_NAMESPACE = "http://richfaces.org/cdk/core"; - public static final String COMPOSITE_NAMESPACE = "http://java.sun.com/jsf/composite"; + public static final String COMPOSITE_NAMESPACE = "http://richfaces.org/cdk/jsf/composite"; private CompositeInterface compositeInterface; Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2009-12-29 18:02:00 UTC (rev 16222) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2009-12-29 18:05:21 UTC (rev 16223) @@ -25,8 +25,8 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xs:schema targetNamespace="http://java.sun.com/jsf/composite" - xmlns:cc="http://java.sun.com/jsf/composite" xmlns:xs="http://www.w3.org/2001/XMLSchema" +<xs:schema targetNamespace="http://richfaces.org/cdk/jsf/composite" + xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xml="http://www.w3.org/XML/1998/namespace" elementFormDefault="qualified" attributeFormDefault="unqualified"> Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2009-12-29 18:02:00 UTC (rev 16222) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2009-12-29 18:05:21 UTC (rev 16223) @@ -25,8 +25,8 @@ --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://java.sun.com/jsp/jstl/core" xmlns="http://java.sun.com/jsp/jstl/core" - xmlns:cdk="http://richfaces.org/cdk" + targetNamespace="http://richfaces.org/cdk/jstl/core" xmlns="http://richfaces.org/cdk/jstl/core" + xmlns:cdk="http://richfaces.org/cdk/core" elementFormDefault="qualified" attributeFormDefault="unqualified"> <xs:annotation> @@ -36,7 +36,7 @@ </xs:documentation> </xs:annotation> - <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk" /> + <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk/core" /> <xs:attributeGroup name="testGroup"> <xs:attribute name="test" form="unqualified" use="required" Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2009-12-29 18:02:00 UTC (rev 16222) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2009-12-29 18:05:21 UTC (rev 16223) @@ -25,14 +25,14 @@ --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://richfaces.org/cdk" xmlns="http://richfaces.org/cdk" + targetNamespace="http://richfaces.org/cdk/core" xmlns="http://richfaces.org/cdk/core" elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns:xhtml="http://richfaces.org/xhtml-el" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite"> + xmlns:xhtml="http://richfaces.org/cdk/xhtml-el" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite"> <xs:import schemaLocation="web-facesuicomponent_2_0.xsd" namespace="http://java.sun.com/xml/ns/javaee" /> - <xs:import schemaLocation="cdk-composite.xsd" namespace="http://java.sun.com/jsf/composite" /> - <xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://java.sun.com/jsp/jstl/core" /> + <xs:import schemaLocation="cdk-composite.xsd" namespace="http://richfaces.org/cdk/jsf/composite" /> + <xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://richfaces.org/cdk/jstl/core" /> <xs:simpleType name="elStrictExpression"> <xs:restriction base="xs:string"> Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2009-12-29 18:02:00 UTC (rev 16222) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2009-12-29 18:05:21 UTC (rev 16223) @@ -25,12 +25,12 @@ --> <xs:schema version="1.0" xml:lang="en" - xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://richfaces.org/xhtml-el" - xmlns="http://richfaces.org/xhtml-el" xmlns:xml="http://www.w3.org/XML/1998/namespace" - elementFormDefault="qualified" xmlns:cdk="http://richfaces.org/cdk" - xmlns:cdk-schema-info="http://richfaces.org/cdk-schema-info"> + xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://richfaces.org/cdk/xhtml-el" + xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:xml="http://www.w3.org/XML/1998/namespace" + elementFormDefault="qualified" xmlns:cdk="http://richfaces.org/cdk/core" + xmlns:cdk-addinfo="http://richfaces.org/cdk/additional-attributes-in... - <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk" /> + <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk/core" /> <xs:annotation> <xs:documentation> @@ -1640,7 +1640,7 @@ <xs:attribute name="dir" use="required"> <xs:annotation> <xs:appinfo> - <cdk-schema-info:default-value>ltr</cdk-schema-info:default-value> + <cdk-addinfo:default-value>ltr</cdk-addinfo:default-value> </xs:appinfo> </xs:annotation> <xs:simpleType>