Author: alexsmirnov Date: 2009-07-24 19:43:17 -0400 (Fri, 24 Jul 2009) New Revision: 15016 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCompilationContext.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/ajax4jsf/templatecompiler/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/component/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/AttributeBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacetBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibraryBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XedrceDefinitionFactory.java Modified: root/cdk/trunk/plugins/generator/pom.xml Log: Fix project build Modified: root/cdk/trunk/plugins/generator/pom.xml =================================================================== --- root/cdk/trunk/plugins/generator/pom.xml 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/pom.xml 2009-07-24 23:43:17 UTC (rev 15016) @@ -22,20 +22,13 @@ <target>1.6</target> </configuration> </plugin> - <!--plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>xjc</goal> - </goals> - </execution> - </executions> - <configuration> - <packageName>org.richfaces.cdk.model</packageName> - </configuration> - </plugin --> + <!-- + plugin> <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> <executions> <execution> + <goals> <goal>xjc</goal> </goals> </execution> </executions> + <configuration> <packageName>org.richfaces.cdk.model</packageName> + </configuration> </plugin + --> </plugins> </build> <dependencies> @@ -50,17 +43,14 @@ <artifactId>freemarker</artifactId> <version>2.3.9</version> </dependency> + <!-- + <dependency> <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> <version>2.1</version> + </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> <version>2.1.10</version> + </dependency> + --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.10</version> - </dependency> - <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> <version>2.0.0-SNAPSHOT</version> @@ -85,18 +75,14 @@ <artifactId>xercesImpl</artifactId> <version>2.9.1</version> </dependency> - <dependency> - <groupId>com.google.collections</groupId> + <!-- + <dependency> <groupId>com.google.collections</groupId> <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> - </dependency> + <version>1.0-rc2</version> </dependency> <dependency> + <groupId>org.w3c.css</groupId> <artifactId>sac</artifactId> + <version>1.3</version> </dependency> + --> <dependency> - <groupId>org.w3c.css</groupId> - <artifactId>sac</artifactId> - <version>1.3</version> - </dependency> - - <dependency> <groupId>wutka</groupId> <artifactId>dtdparser</artifactId> <version>1.21</version> Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCompilationContext.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCompilationContext.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCompilationContext.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,37 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class AbstractCompilationContext { + + public AbstractCompilationContext(ClassLoader loader) { + // TODO Auto-generated constructor stub + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCompilationContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,33 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk; + +/** + * <p class="changed_added_4_0">That class builds JSF library model from different sources</p> + * @author asmirnov(a)exadel.com + * + */ +public class LibraryBuilder { + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/AttributeBean.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,17 @@ +package org.richfaces.cdk.model; + +public class Attribute { + + private String type; + + private String family; + + private String className; + + private String superClass; + + private String renderKit; + + private String template; + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/AttributeBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/AttributeBean.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/AttributeBean.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,17 +0,0 @@ -package org.richfaces.cdk.model; - -public class AttributeBean { - - private String type; - - private String family; - - private String className; - - private String superClass; - - private String renderKit; - - private String template; - -} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,42 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class Behavior implements JsfComponent { + + /* (non-Javadoc) + * @see org.richfaces.cdk.model.JsfComponent#getType() + */ + @Override + public String getType() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentBean.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,87 @@ +package org.richfaces.cdk.model; + +import java.util.List; + +/** + * That class represents JSF component in the CDK. + * @author asmirnov(a)exadel.com + * + */ +public class Component implements JsfComponent { + + /** + * <p class="changed_added_4_0">Component type</p> + */ + private String type; + + /** + * <p class="changed_added_4_0">component family</p> + */ + private String family; + + /** + * <p class="changed_added_4_0">Cenerated component class</p> + */ + private String className; + + /** + * <p class="changed_added_4_0">Base class for generated component</p> + */ + private String superClass; + + /** + * <p class="changed_added_4_0">Long description for documentation</p> + */ + private String description; + + /** + * <p class="changed_added_4_0">Short name for IDE tools</p> + */ + private String displayname; + + /** + * <p class="changed_added_4_0">Icon name for IDE tools</p> + */ + private String icon; + + /** + * <p class="changed_added_4_0">Component attributes</p> + */ + private List<Property> attributes; + + /** + * <p class="changed_added_4_0">VDL tag. This is bidirectional one to one relation.</p> + */ + private Tag tag; + + /** + * <p class="changed_added_4_0">Application level events fired by the component</p> + */ + private List<Event> events; + + /** + * <p class="changed_added_4_0">Renderer for the final component. This is bidirectional one to one relation.</p> + */ + private Attribute renderer; + + /** + * <p class="changed_added_4_0">Facets recognised by the component</p> + */ + private List<Facet> facets; + + /* (non-Javadoc) + * @see org.richfaces.cdk.model.JsfComponent#getType() + */ + public String getType() { + return type; + } + + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentBean.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentBean.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,87 +0,0 @@ -package org.richfaces.cdk.model; - -import java.util.List; - -/** - * That class represents JSF component in the CDK. - * @author asmirnov(a)exadel.com - * - */ -public class ComponentBean implements JsfComponent { - - /** - * <p class="changed_added_4_0">Component type</p> - */ - private String type; - - /** - * <p class="changed_added_4_0">component family</p> - */ - private String family; - - /** - * <p class="changed_added_4_0">Cenerated component class</p> - */ - private String className; - - /** - * <p class="changed_added_4_0">Base class for generated component</p> - */ - private String superClass; - - /** - * <p class="changed_added_4_0">Long description for documentation</p> - */ - private String description; - - /** - * <p class="changed_added_4_0">Short name for IDE tools</p> - */ - private String displayname; - - /** - * <p class="changed_added_4_0">Icon name for IDE tools</p> - */ - private String icon; - - /** - * <p class="changed_added_4_0">Component attributes</p> - */ - private List<PropertyBean> attributes; - - /** - * <p class="changed_added_4_0">VDL tag. This is bidirectional one to one relation.</p> - */ - private TagBean tag; - - /** - * <p class="changed_added_4_0">Application level events fired by the component</p> - */ - private List<EventBean> events; - - /** - * <p class="changed_added_4_0">Renderer for the final component. This is bidirectional one to one relation.</p> - */ - private AttributeBean renderer; - - /** - * <p class="changed_added_4_0">Facets recognised by the component</p> - */ - private List<FacetBean> facets; - - /* (non-Javadoc) - * @see org.richfaces.cdk.model.JsfComponent#getType() - */ - public String getType() { - return type; - } - - /** - * <p class="changed_added_4_0"></p> - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - -} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,55 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +import java.util.List; + +/** + * <p class="changed_added_4_0">That class contains model of all JSF components asscoiated with that project</p> + * @author asmirnov(a)exadel.com + * + */ +public class ComponentLibrary { + + /** + * <p class="changed_added_4_0">JSF components in that library</p> + */ + private List<Component> components; + + /** + * <p class="changed_added_4_0">JSF renderer associated with that library</p> + */ + private List<Renderer> renderers; + + private List<Converter> converters; + + private List<Validator> validators; + + private List<Behavior> behaviors; + /** + * <p class="changed_added_4_0">Tag library with references of all used tags</p> + */ + private TagLibrary tagLibrary; + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,42 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class Converter implements JsfComponent { + + /* (non-Javadoc) + * @see org.richfaces.cdk.model.JsfComponent#getType() + */ + @Override + public String getType() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventBean.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class Event { + + private String name; + + private String description; + + private String className; + + private String listenerInterface; + + private String sourceInterface; + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventBean.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventBean.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,43 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.model; - -/** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ -public class EventBean { - - private String name; - - private String description; - - private String className; - - private String listenerInterface; - - private String sourceInterface; - -} Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacetBean.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,37 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class Facet { + + private String name; + + private String description; + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacetBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacetBean.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacetBean.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,37 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.model; - -/** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ -public class FacetBean { - - private String name; - - private String description; - -} Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBean.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,115 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * That class represents JSF component property. + * @author asmirnov(a)exadel.com + * + */ +public class Property { + + /** + * <p class="changed_added_4_0">Bean property name of component attribute</p> + */ + private String name; + + /** + * <p class="changed_added_4_0">Name of the attribute type class</p> + */ + private String classname; + + /** + * <p class="changed_added_4_0">Attribute description</p> + */ + private String description; + + /** + * <p class="changed_added_4_0">Display name for IDE</p> + */ + private String displayname; + + /** + * <p class="changed_added_4_0"></p> + * @return the name + */ + public String getName() { + return name; + } + + /** + * <p class="changed_added_4_0"></p> + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the classname + */ + public String getClassname() { + return classname; + } + + /** + * <p class="changed_added_4_0"></p> + * @param classname the classname to set + */ + public void setClassname(String classname) { + this.classname = classname; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * <p class="changed_added_4_0"></p> + * @param description the description to set + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the displayname + */ + public String getDisplayname() { + return displayname; + } + + /** + * <p class="changed_added_4_0"></p> + * @param displayname the displayname to set + */ + public void setDisplayname(String displayname) { + this.displayname = displayname; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBean.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBean.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,115 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.model; - -/** - * That class represents JSF component property. - * @author asmirnov(a)exadel.com - * - */ -public class PropertyBean { - - /** - * <p class="changed_added_4_0">Bean property name of component attribute</p> - */ - private String name; - - /** - * <p class="changed_added_4_0">Name of the attribute type class</p> - */ - private String classname; - - /** - * <p class="changed_added_4_0">Attribute description</p> - */ - private String description; - - /** - * <p class="changed_added_4_0">Display name for IDE</p> - */ - private String displayname; - - /** - * <p class="changed_added_4_0"></p> - * @return the name - */ - public String getName() { - return name; - } - - /** - * <p class="changed_added_4_0"></p> - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the classname - */ - public String getClassname() { - return classname; - } - - /** - * <p class="changed_added_4_0"></p> - * @param classname the classname to set - */ - public void setClassname(String classname) { - this.classname = classname; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the description - */ - public String getDescription() { - return description; - } - - /** - * <p class="changed_added_4_0"></p> - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the displayname - */ - public String getDisplayname() { - return displayname; - } - - /** - * <p class="changed_added_4_0"></p> - * @param displayname the displayname to set - */ - public void setDisplayname(String displayname) { - this.displayname = displayname; - } - -} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,42 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class Renderer implements JsfComponent { + + /* (non-Javadoc) + * @see org.richfaces.cdk.model.JsfComponent#getType() + */ + @Override + public String getType() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagBean.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,65 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0">That bean represents VDL tag</p> + * @author asmirnov(a)exadel.com + * + */ +public class Tag { + + /** + * <p class="changed_added_4_0">Tag name</p> + */ + private String name; + + /** + * <p class="changed_added_4_0">Tag library for which that tag is belong. + * This is bidirectional many to one relation.</p> + */ + private TagLibrary library; + + /** + * <p class="changed_added_4_0">Facelets VDL tag handler class.</p> + */ + private String tagHandlerClass; + + /** + * <p class="changed_added_4_0">Facelets VDL tag handler base class for generation.</p> + */ + private String tagHandlerSuperClass; + + /** + * <p class="changed_added_4_0">Jsp tag class</p> + */ + private String jspClass; + + /** + * <p class="changed_added_4_0">Component that the tag creates. This in bidirectional one to one relation.</p> + * TODO - tag should also works with {@code Validator}, {@code Converter}, {@code Behavior}, {@code FacesListener} + */ + private JsfComponent component; + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagBean.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagBean.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,65 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.model; - -/** - * <p class="changed_added_4_0">That bean represents VDL tag</p> - * @author asmirnov(a)exadel.com - * - */ -public class TagBean { - - /** - * <p class="changed_added_4_0">Tag name</p> - */ - private String name; - - /** - * <p class="changed_added_4_0">Tag library for which that tag is belong. - * This is bidirectional many to one relation.</p> - */ - private TagLibraryBean library; - - /** - * <p class="changed_added_4_0">Facelets VDL tag handler class.</p> - */ - private String tagHandlerClass; - - /** - * <p class="changed_added_4_0">Facelets VDL tag handler base class for generation.</p> - */ - private String tagHandlerSuperClass; - - /** - * <p class="changed_added_4_0">Jsp tag class</p> - */ - private String jspClass; - - /** - * <p class="changed_added_4_0">Component that the tag creates. This in bidirectional one to one relation.</p> - * TODO - tag should also works with {@code Validator}, {@code Converter}, {@code Behavior}, {@code FacesListener} - */ - private JsfComponent component; - -} Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibraryBean.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,56 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +import java.util.List; + +/** + * <p class="changed_added_4_0">That bean represents whole tag library.</p> + * @author asmirnov(a)exadel.com + * + */ +public class TagLibrary { + + /** + * <p class="changed_added_4_0">Collection of tags associated with that library</p> + */ + private List<Tag> tags; + + /** + * <p class="changed_added_4_0"></p> + * @return the tags + */ + public List<Tag> getTags() { + return tags; + } + + /** + * <p class="changed_added_4_0"></p> + * @param tags the tags to set + */ + public void setTags(List<Tag> tags) { + this.tags = tags; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibraryBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibraryBean.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibraryBean.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,37 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.model; - -import java.util.List; - -/** - * <p class="changed_added_4_0">That bean represents whole tag library.</p> - * @author asmirnov(a)exadel.com - * - */ -public class TagLibraryBean { - - private List<TagBean> tags; - -} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,42 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class Validator implements JsfComponent { + + /* (non-Javadoc) + * @see org.richfaces.cdk.model.JsfComponent#getType() + */ + @Override + public String getType() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XedrceDefinitionFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XedrceDefinitionFactory.java 2009-07-24 19:46:55 UTC (rev 15015) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XedrceDefinitionFactory.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -1,143 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.xmlutils.dtd.xerces; - -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.apache.xerces.impl.Constants; -import org.apache.xerces.parsers.XMLGrammarPreparser; -import org.apache.xerces.xni.XNIException; -import org.apache.xerces.xni.grammars.Grammar; -import org.apache.xerces.xni.grammars.XMLGrammarDescription; -import org.apache.xerces.xni.grammars.XSGrammar; -import org.apache.xerces.xni.parser.XMLInputSource; -import org.apache.xerces.xs.XSModel; -import org.richfaces.cdk.Logger; -import org.richfaces.cdk.LoggerFactory; -import org.richfaces.cdk.xmlutils.dtd.DocumentDefinition; -import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; - -/** - * <p class="changed_added_4_0"> - * That class implements {@link DocumentDefinitionFactory} that parses XML - * schema using Xerces Xml Schema API - * </p> - * - * @author asmirnov(a)exadel.com - * - */ -public class XedrceDefinitionFactory extends DocumentDefinitionFactory { - - private final Logger log = LoggerFactory.getLogger(); - /** Namespaces feature id (http://xml.org/sax/features/namespaces). */ - public static final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces"; - /** Validation feature id (http://xml.org/sax/features/validation). */ - public static final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation"; - /** - * Schema validation feature id - * (http://apache.org/xml/features/validation/schema). - */ - public static final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema"; - /** - * Schema full checking feature id - * (http://apache.org/xml/features/validation/schema-full-checking). - */ - public static final String SCHEMA_FULL_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking"; - - // feature: continue-after-fatal-error - public final static String CONTINUE_AFTER_FATAL_ERROR = Constants.XERCES_FEATURE_PREFIX - + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE; - /** Property identifier: symbol table. */ - public static final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX - + Constants.SYMBOL_TABLE_PROPERTY; - /** Property identifier: error reporter. */ - public static final String ERROR_REPORTER = Constants.XERCES_PROPERTY_PREFIX - + Constants.ERROR_REPORTER_PROPERTY; - /** Property identifier: error handler. */ - public static final String ERROR_HANDLER = Constants.XERCES_PROPERTY_PREFIX - + Constants.ERROR_HANDLER_PROPERTY; - /** Property identifier: entity resolver. */ - public static final String ENTITY_RESOLVER = Constants.XERCES_PROPERTY_PREFIX - + Constants.ENTITY_RESOLVER_PROPERTY; - /** Property identifier: grammar pool . */ - public static final String GRAMMAR_POOL = Constants.XERCES_PROPERTY_PREFIX - + Constants.XMLGRAMMAR_POOL_PROPERTY; - - private Map<URL, DocumentDefinition> definitions = new HashMap<URL, DocumentDefinition>(); - - @Override - public synchronized DocumentDefinition getDocumentDefinition(URL resource) { - DocumentDefinition def = null; - if (definitions.containsKey(resource)) { - def = definitions.get(resource); - } else { - - try { - def = initDefinition(resource); - } catch (Exception e) { - log.error("An error has occured", e); - } - - if (def != null) { - definitions.put(resource, def); - } - } - return def; - } - - public DocumentDefinition initDefinition(URL resource) { - XMLGrammarPreparser preparser = new XMLGrammarPreparser(); - // preparser.registerPreparser(XMLGrammarDescription.XML_DTD, null); - preparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA, null); - - // preparser.setProperty(GRAMMAR_POOL, grammarPool); - preparser.setFeature(NAMESPACES_FEATURE_ID, true); - preparser.setFeature(VALIDATION_FEATURE_ID, true); - // note we can set schema features just in case... - preparser.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true); - preparser.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true); - - try { - Grammar g = preparser.preparseGrammar( - XMLGrammarDescription.XML_SCHEMA, - createInputSource(resource)); - XSGrammar grammar = (XSGrammar) g; - XSModel model = grammar.toXSModel(); - // TODO - make DocumentDefinition from XML schema. - } catch (XNIException e) { - log.error(e); - } catch (IOException e) { - log.error(e); - } - return null; - } - - protected XMLInputSource createInputSource(URL resource) { - return new XMLInputSource(null, resource.toExternalForm(), null); - } - -} Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java (from rev 15014, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XedrceDefinitionFactory.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java 2009-07-24 23:43:17 UTC (rev 15016) @@ -0,0 +1,143 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlutils.dtd.xerces; + +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.apache.xerces.impl.Constants; +import org.apache.xerces.parsers.XMLGrammarPreparser; +import org.apache.xerces.xni.XNIException; +import org.apache.xerces.xni.grammars.Grammar; +import org.apache.xerces.xni.grammars.XMLGrammarDescription; +import org.apache.xerces.xni.grammars.XSGrammar; +import org.apache.xerces.xni.parser.XMLInputSource; +import org.apache.xerces.xs.XSModel; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.LoggerFactory; +import org.richfaces.cdk.xmlutils.dtd.DocumentDefinition; +import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; + +/** + * <p class="changed_added_4_0"> + * That class implements {@link DocumentDefinitionFactory} that parses XML + * schema using Xerces Xml Schema API + * </p> + * + * @author asmirnov(a)exadel.com + * + */ +public class XercesDefinitionFactory extends DocumentDefinitionFactory { + + private final Logger log = LoggerFactory.getLogger(); + /** Namespaces feature id (http://xml.org/sax/features/namespaces). */ + public static final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces"; + /** Validation feature id (http://xml.org/sax/features/validation). */ + public static final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation"; + /** + * Schema validation feature id + * (http://apache.org/xml/features/validation/schema). + */ + public static final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema"; + /** + * Schema full checking feature id + * (http://apache.org/xml/features/validation/schema-full-checking). + */ + public static final String SCHEMA_FULL_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking"; + + // feature: continue-after-fatal-error + public final static String CONTINUE_AFTER_FATAL_ERROR = Constants.XERCES_FEATURE_PREFIX + + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE; + /** Property identifier: symbol table. */ + public static final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX + + Constants.SYMBOL_TABLE_PROPERTY; + /** Property identifier: error reporter. */ + public static final String ERROR_REPORTER = Constants.XERCES_PROPERTY_PREFIX + + Constants.ERROR_REPORTER_PROPERTY; + /** Property identifier: error handler. */ + public static final String ERROR_HANDLER = Constants.XERCES_PROPERTY_PREFIX + + Constants.ERROR_HANDLER_PROPERTY; + /** Property identifier: entity resolver. */ + public static final String ENTITY_RESOLVER = Constants.XERCES_PROPERTY_PREFIX + + Constants.ENTITY_RESOLVER_PROPERTY; + /** Property identifier: grammar pool . */ + public static final String GRAMMAR_POOL = Constants.XERCES_PROPERTY_PREFIX + + Constants.XMLGRAMMAR_POOL_PROPERTY; + + private Map<URL, DocumentDefinition> definitions = new HashMap<URL, DocumentDefinition>(); + + @Override + public synchronized DocumentDefinition getDocumentDefinition(URL resource) { + DocumentDefinition def = null; + if (definitions.containsKey(resource)) { + def = definitions.get(resource); + } else { + + try { + def = initDefinition(resource); + } catch (Exception e) { + log.error("An error has occured", e); + } + + if (def != null) { + definitions.put(resource, def); + } + } + return def; + } + + public DocumentDefinition initDefinition(URL resource) { + XMLGrammarPreparser preparser = new XMLGrammarPreparser(); + // preparser.registerPreparser(XMLGrammarDescription.XML_DTD, null); + preparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA, null); + + // preparser.setProperty(GRAMMAR_POOL, grammarPool); + preparser.setFeature(NAMESPACES_FEATURE_ID, true); + preparser.setFeature(VALIDATION_FEATURE_ID, true); + // note we can set schema features just in case... + preparser.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true); + preparser.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true); + + try { + Grammar g = preparser.preparseGrammar( + XMLGrammarDescription.XML_SCHEMA, + createInputSource(resource)); + XSGrammar grammar = (XSGrammar) g; + XSModel model = grammar.toXSModel(); + // TODO - make DocumentDefinition from XML schema. + } catch (XNIException e) { + log.error(e); + } catch (IOException e) { + log.error(e); + } + return null; + } + + protected XMLInputSource createInputSource(URL resource) { + return new XMLInputSource(null, resource.toExternalForm(), null); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain