[richfaces-svn-commits] JBoss Rich Faces SVN: r16544 - in root/cdk/trunk/plugins/generator: src/main/java/org/richfaces/cdk/model and 5 other directories.

Author: alexsmirnov Date: 2010-03-09 18:46:13 -0500 (Tue, 09 Mar 2010) New Revision: 16544 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java Modified: root/cdk/trunk/plugins/generator/pom.xml 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/util/JavaUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml Log: CODING IN PROGRESS - issue RF-7736: Library model verifier. https://jira.jboss.org/jira/browse/RF-7736 XML-related tests fixed. Modified: root/cdk/trunk/plugins/generator/pom.xml =================================================================== --- root/cdk/trunk/plugins/generator/pom.xml 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/pom.xml 2010-03-09 23:46:13 UTC (rev 16544) @@ -116,7 +116,7 @@ <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <scope>test</scope> - <version>1.2</version> + <version>1.3</version> </dependency> <dependency> Modified: 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 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -91,6 +91,8 @@ private final ModelCollection<BehaviorModel> behaviors = ModelCollection.<BehaviorModel>create(); private ConfigExtension extension; + + private boolean metadataComplete; /** * <p class="changed_added_4_0"> @@ -139,6 +141,7 @@ } } + @SuppressWarnings("unchecked") private void visitCollection(Visitor visitor, ModelCollection<?> models) { for (ModelElement component : models) { component.accept(visitor); @@ -261,6 +264,22 @@ this.extension = extension; } + /** + * <p class="changed_added_4_0"></p> + * @return the metadataComplete + */ + public boolean isMetadataComplete() { + return this.metadataComplete; + } + + /** + * <p class="changed_added_4_0"></p> + * @param metadataComplete the metadataComplete to set + */ + public void setMetadataComplete(boolean metadataComplete) { + this.metadataComplete = metadataComplete; + } + @Override public long lastModified() { return lastModified; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -21,14 +21,29 @@ */ package org.richfaces.cdk.util; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Collection; import java.util.Locale; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.xmlconfig.JAXBBinding; + +import com.google.common.collect.ImmutableMap; + /** * @author Nick Belaevski * */ public final class JavaUtils { + public static final ImmutableMap<Class<?>, Class<?>> BOXING_CLASSES = + ImmutableMap.<Class<?>, Class<?>> builder().put(Boolean.TYPE, Boolean.class).put(Character.TYPE, + Character.class).put(Byte.TYPE, Byte.class).put(Short.TYPE, Short.class).put(Integer.TYPE, Integer.class) + .put(Long.TYPE, Long.class).put(Float.TYPE, Float.class).put(Double.TYPE, Double.class).build(); + private JavaUtils() { // private constructor } @@ -166,4 +181,65 @@ public static boolean isdigit(char c) { return (c >= '0') && (c <= '9'); } + + public static Class<?> toBoxingClass(Class<?> targetType) { + if (targetType.isPrimitive()) { + return BOXING_CLASSES.get(targetType); + } + return targetType; + } + + public static void copyProperties(Object source, Object destination) throws CdkException { + try { + PropertyDescriptor[] targetProperties = + Introspector.getBeanInfo(destination.getClass()).getPropertyDescriptors(); + PropertyDescriptor[] sourceProperties = + Introspector.getBeanInfo(source.getClass()).getPropertyDescriptors(); + + for (PropertyDescriptor targetProperty : targetProperties) { + String name = targetProperty.getName(); + + for (PropertyDescriptor sourceProperty : sourceProperties) { + if (!JAXBBinding.IGNORE_PROPERTIES.contains(name) && name.equals(sourceProperty.getName())) { + + writeProperty(source, destination, targetProperty, sourceProperty); + } + } + } + } catch (Exception e) { + throw new CdkException("Properties copiing error", e); + } + } + + public static void writeProperty(Object source, Object destination, PropertyDescriptor targetProperty, + PropertyDescriptor sourceProperty) throws IllegalAccessException, InvocationTargetException { + Method readMethod = sourceProperty.getReadMethod(); + if (readMethod == null) { + return; + } + + Object propertyValue = readMethod.invoke(source); + if (propertyValue != null) { + Class<?> targetType = targetProperty.getPropertyType(); + targetType = toBoxingClass(targetType); + Class<?> sourceType = sourceProperty.getPropertyType(); + sourceType = toBoxingClass(sourceType); + Method writeMethod = targetProperty.getWriteMethod(); + if (JAXBBinding.isCollections(targetType, propertyValue)) { + Collection targetCollection = (Collection) targetProperty.getReadMethod().invoke(destination); + + if (null != targetCollection) { + targetCollection.addAll((Collection) propertyValue); + } else if (writeMethod != null) { + writeMethod.invoke(destination, propertyValue); + } + } else if (writeMethod != null) { + if (targetType.equals(sourceType)) { + writeMethod.invoke(destination, propertyValue); + } else if (targetType.equals(String.class)) { + writeMethod.invoke(destination, propertyValue.toString()); + } + } + } + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -23,24 +23,20 @@ package org.richfaces.cdk.xmlconfig.model; +import java.lang.reflect.Method; import java.util.List; import java.util.Map; import javax.xml.bind.annotation.adapters.XmlAdapter; import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.model.ModelElement; -import org.richfaces.cdk.model.Extensible; import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.xmlconfig.JAXBBinding; +import org.richfaces.cdk.model.Extensible; +import org.richfaces.cdk.model.ModelElement; +import org.richfaces.cdk.util.JavaUtils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.util.Collection; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; -import java.beans.PropertyDescriptor; -import java.beans.Introspector; /** * <p class="changed_added_4_0"></p> @@ -48,7 +44,7 @@ * @author asmirnov(a)exadel.com */ public abstract class AdapterBase<Bean, Model> extends XmlAdapter<Bean, Model> { - + @Override public Bean marshal(Model model) throws CdkException { Bean bean = createBean(getBeanClass(model), model); @@ -75,7 +71,7 @@ Bean adapter = beanClass.newInstance(); // Copy properties from model to adapter. - copyProperties(model, adapter); + JavaUtils.copyProperties(model, adapter); if (model instanceof Extensible && adapter instanceof Extensible) { copyExtensions((Extensible) model, (Extensible) adapter, true); } @@ -108,7 +104,7 @@ return ((Class<E>) method.getReturnType()).newInstance(); } - private void copyExtensions(Extensible source, Extensible<ConfigExtension> destination, boolean fromModel) { + private void copyExtensions(Extensible source, Extensible<ConfigExtension> destination, Boolean fromModel) { try { ConfigExtension sourceExtension = source.getExtension(); @@ -118,16 +114,16 @@ destinationExtension.setExtensions(sourceExtension.getExtensions()); if (fromModel) { - copyProperties(source, destinationExtension); + JavaUtils.copyProperties(source, destinationExtension); } else { - copyProperties(sourceExtension, destination); + JavaUtils.copyProperties(sourceExtension, destination); } destination.setExtension(destinationExtension); } else if (fromModel) { ConfigExtension destinationExtension = createExtension(destination); - copyProperties(source, destinationExtension); + JavaUtils.copyProperties(source, destinationExtension); destination.setExtension(destinationExtension); } } catch (Exception e) { @@ -135,66 +131,12 @@ } } - protected static void copyProperties(Object source, Object destination) throws CdkException { - try { - PropertyDescriptor[] targetProperties = - Introspector.getBeanInfo(destination.getClass()).getPropertyDescriptors(); - PropertyDescriptor[] sourceProperties = - Introspector.getBeanInfo(source.getClass()).getPropertyDescriptors(); - - for (PropertyDescriptor targetProperty : targetProperties) { - String name = targetProperty.getName(); - - for (PropertyDescriptor sourceProperty : sourceProperties) { - if (!JAXBBinding.IGNORE_PROPERTIES.contains(name) - && name.equals(sourceProperty.getName())) { - - writeProperty(source, destination, targetProperty, sourceProperty); - } - } - } - } catch (Exception e) { - throw new CdkException("Properties copiing error", e); - } - } - - private static void writeProperty(Object source, Object destination, PropertyDescriptor targetProperty, PropertyDescriptor sourceProperty) throws IllegalAccessException, InvocationTargetException { - Method readMethod = sourceProperty.getReadMethod(); - if (readMethod == null) { - return; - } - - Object propertyValue = readMethod.invoke(source); - if (propertyValue != null) { - Class<?> targetType = targetProperty.getPropertyType(); - Class<?> sourceType = sourceProperty.getPropertyType(); - - Method writeMethod = targetProperty.getWriteMethod(); - if (JAXBBinding.isCollections(targetType, propertyValue)) { - Collection targetCollection = - (Collection) targetProperty.getReadMethod().invoke(destination); - - if (null != targetCollection) { - targetCollection.addAll((Collection) propertyValue); - } else if (writeMethod != null) { - writeMethod.invoke(destination, propertyValue); - } - } else if (writeMethod != null) { - if (targetType.equals(sourceType)) { - writeMethod.invoke(destination, propertyValue); - } else if (targetType.equals(String.class)) { - writeMethod.invoke(destination, propertyValue.toString()); - } - } - } - } - protected Model createModelElement(Class<? extends Model> modelClass, Bean adapter) { try { Model modelBean = modelClass.newInstance(); - copyProperties(adapter, modelBean); + JavaUtils.copyProperties(adapter, modelBean); if (adapter instanceof Extensible && modelBean instanceof Extensible) { copyExtensions((Extensible) adapter, (Extensible) modelBean, false); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -29,8 +29,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.FacesId; import com.google.common.collect.Lists; @@ -40,12 +40,12 @@ * @since Jan 21, 2010 */ @XmlType(name = "faces-config-behaviorType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - propOrder={"id", "behaviorClass", "attributes", "extension"}) + propOrder={"id", "targetClass", "attributes", "extension"}) @XmlJavaTypeAdapter(BehaviorAdapter.class) public class BehaviorBean extends ExtensibleBean<BehaviorBean.BehaviorExtension> { - private String behaviorClass; + private ClassName targetClass; private List<PropertyBase> attributes = Lists.newArrayList(); @@ -61,12 +61,12 @@ } @XmlElement(name = "behavior-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getBehaviorClass() { - return behaviorClass; + public ClassName getTargetClass() { + return targetClass; } - public void setBehaviorClass(String behaviorClass) { - this.behaviorClass = behaviorClass; + public void setTargetClass(ClassName behaviorClass) { + this.targetClass = behaviorClass; } @@ -93,5 +93,6 @@ super.setExtension(extension); } - public static class BehaviorExtension extends ConfigExtension { } + public static class BehaviorExtension extends ExtensionBeanBase { + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -32,18 +32,14 @@ * * @author asmirnov(a)exadel.com */ -public class ClassAdapter extends XmlAdapter<ClassBean, ClassName> { +public class ClassAdapter extends XmlAdapter<String, ClassName> { @Override - public ClassBean marshal(ClassName v) throws Exception { - ClassBean bean = new ClassBean(); - - bean.setName(v.getName()); - - return bean; + public String marshal(ClassName v) throws Exception { + return v.getName(); } @Override - public ClassName unmarshal(ClassBean v) throws Exception { - return new ClassName(v.getName()); + public ClassName unmarshal(String v) throws Exception { + return new ClassName(v); } } Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -1,58 +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.xmlconfig.model; - -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - -import org.richfaces.cdk.model.ComponentLibrary; - -/** - * <p class="changed_added_4_0"></p> - * - * @author asmirnov(a)exadel.com - */ -@XmlType(name = "fully-qualified-classType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) -public class ClassBean { - private String name; - - /** - * <p class="changed_added_4_0"></p> - * - * @return the name - */ - @XmlValue - 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; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -32,7 +32,6 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.EventModel; import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.FacetModel; @@ -46,15 +45,14 @@ * @author asmirnov(a)exadel.com */ @XmlType(name = "faces-config-componentType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - propOrder={"type", "componentClass", "facets", + propOrder={"type", "targetClass", "facets", "attributes", "extension"}) @XmlJavaTypeAdapter(ComponentAdapter.class) public class ComponentBean extends ExtensibleBean<ComponentBean.ComponentExtension> { - private boolean generate = false; - + private List<Property> attributes = Lists.newArrayList(); private List<FacetModel> facets = Lists.newArrayList(); - private ClassName componentClass; + private ClassName targetClass; private FacesId type; /** @@ -79,21 +77,21 @@ /** * <p class="changed_added_4_0"></p> * - * @return the componentClass + * @return the targetClass */ @XmlElement(name = "component-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlJavaTypeAdapter(ClassAdapter.class) - public ClassName getComponentClass() { - return componentClass; + public ClassName getTargetClass() { + return targetClass; } /** * <p class="changed_added_4_0"></p> * - * @param className the componentClass to set + * @param className the targetClass to set */ - public void setComponentClass(ClassName className) { - this.componentClass = className; + public void setTargetClass(ClassName className) { + this.targetClass = className; } /** @@ -161,13 +159,10 @@ super.setExtension(extension); } - public static class ComponentExtension extends ConfigExtension { + public static class ComponentExtension extends ExtensionBeanBase { private List<String> rendererTypes = Lists.newArrayList(); private List<EventModel> events = Lists.newArrayList(); - private ClassName baseClass; private String family; - private boolean generate; - /** * <p class="changed_added_4_0"></p> * @@ -190,45 +185,6 @@ /** * <p class="changed_added_4_0"></p> * - * @return the baseClass - */ - @XmlElement(name = "base-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - @XmlJavaTypeAdapter(ClassAdapter.class) - public ClassName getBaseClass() { - return baseClass; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param baseClass the baseClass to set - */ - public void setBaseClass(ClassName baseClass) { - this.baseClass = baseClass; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the generate - */ - @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isGenerate() { - return generate; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param generate the generate to set - */ - public void setGenerate(boolean generate) { - this.generate = generate; - } - - /** - * <p class="changed_added_4_0"></p> - * * @param rendererTypes the rendererTypes to set */ @XmlElement(name = "renderer-type", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -266,11 +222,4 @@ } } - public boolean isGenerate() { - return generate; - } - - public void setGenerate(boolean generate) { - this.generate = generate; - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -28,8 +28,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.FacesId; import com.google.common.collect.Lists; @@ -39,15 +39,15 @@ * @since Jan 6, 2010 */ @XmlType(name = "faces-config-converterType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - propOrder={"id", "converterForClass", "converterClass", + propOrder={"id", "converterForClass", "targetClass", "attributes", "extension"}) @XmlJavaTypeAdapter(ConverterAdapter.class) public class ConverterBean extends ExtensibleBean<ConverterBean.ConverterExtension> { - private String converterForClass; + private ClassName converterForClass; - private String converterClass; + private ClassName targetClass; private List<PropertyBase> attributes = Lists.newArrayList(); @@ -63,21 +63,21 @@ } @XmlElement(name = "converter-for-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getConverterForClass() { + public ClassName getConverterForClass() { return converterForClass; } - public void setConverterForClass(String converterForClass) { + public void setConverterForClass(ClassName converterForClass) { this.converterForClass = converterForClass; } @XmlElement(name = "converter-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getConverterClass() { - return converterClass; + public ClassName getTargetClass() { + return targetClass; } - public void setConverterClass(String converterClass) { - this.converterClass = converterClass; + public void setTargetClass(ClassName converterClass) { + this.targetClass = converterClass; } /** @@ -118,5 +118,7 @@ return super.getExtension(); } - public static class ConverterExtension extends ConfigExtension { } + public static class ConverterExtension extends ExtensionBeanBase { + + } } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -0,0 +1,58 @@ +package org.richfaces.cdk.xmlconfig.model; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; + +public class ExtensionBeanBase extends ConfigExtension { + + private ClassName baseClass; + private Boolean generate; + + public ExtensionBeanBase() { + super(); + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the baseClass + */ + @XmlElement(name = "base-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + @XmlJavaTypeAdapter(ClassAdapter.class) + public ClassName getBaseClass() { + return baseClass; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param baseClass the baseClass to set + */ + public void setBaseClass(ClassName baseClass) { + this.baseClass = baseClass; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the generate + */ + @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public Boolean getGenerate() { + return generate; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param generate the generate to set + */ + public void setGenerate(Boolean generate) { + this.generate = generate; + } + +} \ No newline at end of file Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -73,7 +73,7 @@ private String version = "2.0"; @XmlAttribute(name = "metadata-complete") - private boolean metadataComplete; + private Boolean metadataComplete; @XmlElement(name = "faces-config-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) private FacesConfigExtension extension; @@ -100,7 +100,7 @@ * <p class="changed_added_4_0"></p> * @return the metadataComplete */ - public boolean isMetadataComplete() { + public Boolean getMetadataComplete() { return this.metadataComplete; } @@ -108,7 +108,7 @@ * <p class="changed_added_4_0"></p> * @param metadataComplete the metadataComplete to set */ - public void setMetadataComplete(boolean metadataComplete) { + public void setMetadataComplete(Boolean metadataComplete) { this.metadataComplete = metadataComplete; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -78,7 +78,7 @@ * @author asmirnov(a)exadel.com */ public static final class FacetExtension extends ConfigExtension { - private boolean generate; + private Boolean generate; /** * <p class="changed_added_4_0"></p> @@ -86,7 +86,7 @@ * @return the generate */ @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isGenerate() { + public Boolean getGenerate() { return generate; } @@ -95,7 +95,7 @@ * * @param generate the generate to set */ - public void setGenerate(boolean generate) { + public void setGenerate(Boolean generate) { this.generate = generate; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -137,15 +137,15 @@ * @author asmirnov(a)exadel.com */ public static class PropertyExtension extends ConfigExtension { - private boolean passThrough = false; + private Boolean passThrough; private Set<EventName> eventNames = Sets.newLinkedHashSet(); private List<ClassName> signature = Lists.newArrayList(); private Set<String> aliases = Sets.newHashSet(); - private boolean generate; - private boolean hidden; - private boolean literal; - private boolean readOnly; - private boolean required; + private Boolean generate; + private Boolean hidden; + private Boolean literal; + private Boolean readOnly; + private Boolean required; /** * <p class="changed_added_4_0"></p> @@ -153,7 +153,7 @@ * @return the generate */ @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isGenerate() { + public Boolean getGenerate() { return generate; } @@ -162,7 +162,7 @@ * * @param generate the generate to set */ - public void setGenerate(boolean generate) { + public void setGenerate(Boolean generate) { this.generate = generate; } @@ -172,7 +172,7 @@ * @return the hidden */ @XmlElement(name = "hidden", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isHidden() { + public Boolean getHidden() { return hidden; } @@ -181,7 +181,7 @@ * * @param hidden the hidden to set */ - public void setHidden(boolean hidden) { + public void setHidden(Boolean hidden) { this.hidden = hidden; } @@ -191,7 +191,7 @@ * @return the literal */ @XmlElement(name = "literal", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isLiteral() { + public Boolean getLiteral() { return literal; } @@ -200,7 +200,7 @@ * * @param literal the literal to set */ - public void setLiteral(boolean literal) { + public void setLiteral(Boolean literal) { this.literal = literal; } @@ -210,7 +210,7 @@ * @return the required */ @XmlElement(name = "required", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isRequired() { + public Boolean getRequired() { return required; } @@ -219,7 +219,7 @@ * * @param required the required to set */ - public void setRequired(boolean required) { + public void setRequired(Boolean required) { this.required = required; } @@ -229,7 +229,7 @@ * @return the readOnly */ @XmlElement(name = "read-only", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isReadOnly() { + public Boolean getReadOnly() { return readOnly; } @@ -238,7 +238,7 @@ * * @param readOnly the readOnly to set */ - public void setReadOnly(boolean readOnly) { + public void setReadOnly(Boolean readOnly) { this.readOnly = readOnly; } @@ -248,7 +248,7 @@ * @return the passThrough */ @XmlElement(name = "pass-through", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isPassThrough() { + public Boolean getPassThrough() { return passThrough; } @@ -257,7 +257,7 @@ * * @param passThrough the passThrough to set */ - public void setPassThrough(boolean passThrough) { + public void setPassThrough(Boolean passThrough) { this.passThrough = passThrough; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -23,13 +23,13 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.ClassName; -import org.richfaces.cdk.model.ComponentLibrary; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentLibrary; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -23,16 +23,23 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; -import org.richfaces.cdk.model.*; -import org.richfaces.cdk.model.RenderKitModel.Id; +import java.util.List; import javax.faces.render.RenderKitFactory; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; +import org.richfaces.cdk.model.BehaviorRenderer; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RendererModel; +import org.richfaces.cdk.model.RenderKitModel.Id; + +import com.google.common.collect.Lists; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -163,7 +163,7 @@ public static class RendererExtension extends ConfigExtension { private TagModel tag; - private boolean rendersChildren; + private Boolean rendersChildren; /** * <p class="changed_added_4_0"> @@ -195,7 +195,7 @@ * @return the rendersChildren */ @XmlElement(name = "renders-children", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isRendersChildren() { + public Boolean getRendersChildren() { return this.rendersChildren; } @@ -205,7 +205,7 @@ * * @param rendersChildren the rendersChildren to set */ - public void setRendersChildren(boolean rendersChildren) { + public void setRendersChildren(Boolean rendersChildren) { this.rendersChildren = rendersChildren; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -28,8 +28,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.FacesId; import com.google.common.collect.Lists; @@ -39,12 +39,12 @@ * @since Jan 13, 2010 */ @XmlType(name = "faces-config-validatorType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - propOrder={"id", "validatorClass", "attributes", "extension"}) + propOrder={"id", "targetClass", "attributes", "extension"}) @XmlJavaTypeAdapter(ValidatorAdapter.class) public class ValidatorBean extends ExtensibleBean<ValidatorBean.ValidatorExtension> { - private String validatorClass; + private ClassName targetClass; private List<PropertyBase> attributes = Lists.newArrayList(); @@ -60,12 +60,12 @@ } @XmlElement(name = "validator-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getValidatorClass() { - return validatorClass; + public ClassName getTargetClass() { + return targetClass; } - public void setValidatorClass(String validatorClass) { - this.validatorClass = validatorClass; + public void setTargetClass(ClassName validatorClass) { + this.targetClass = validatorClass; } @@ -92,5 +92,7 @@ super.setExtension(extension); } - public static class ValidatorExtension extends ConfigExtension { } + public static class ValidatorExtension extends ExtensionBeanBase { + + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -27,8 +27,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; +import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; -import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.Property; + Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -56,6 +56,7 @@ replay(output); BehaviorModel behavior = new BehaviorModel(FacesId.parseId("foo.bar")); + behavior.setGenerate(true); behavior.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedBehavior")); behavior.setBaseClass(ClassName.parseName("Object")); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -59,7 +59,7 @@ converter.setId(FacesId.parseId("foo.bar")); converter.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedConverter")); converter.setBaseClass(ClassName.parseName("Object")); - + converter.setGenerate(true); addAttribute(converter, "myClass", PropertyModel.class, true); addAttribute(converter, "testObject", Object.class, true); addAttribute(converter, "testBoolean", Boolean.class, true); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -59,7 +59,7 @@ validator.setId(FacesId.parseId("foo.bar")); validator.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedValidator")); validator.setBaseClass(ClassName.parseName("Object")); - + validator.setGenerate(true); addAttribute(validator, "testValue", Object.class, true); // TODO test with primitiv type 'boolean' addAttribute(validator, "testFlag", Boolean.class, true); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -104,7 +104,7 @@ assertEquals("panel-large.gif", component.getIcon().getLargeIcon()); assertEquals("Panel component", component.getDescription()); assertEquals("Panel", component.getDisplayname()); - assertFalse(component.isGenerate()); + assertTrue(component.isGenerate()); FacetModel facet = Iterables.getOnlyElement(component.getFacets()); assertEquals("header", facet.getName()); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java 2010-03-09 23:46:13 UTC (rev 16544) @@ -23,6 +23,7 @@ import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.Validator; +import org.custommonkey.xmlunit.XMLUnit; import org.junit.Assert; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; @@ -63,12 +64,12 @@ if (expectedFacesConfigFile == null) { return; } - + XMLUnit.setNormalizeWhitespace(true); Diff xmlDiff = new Diff( new StringReader(writer.toString()), new InputStreamReader(expectedFacesConfigFile)); - Assert.assertTrue("XML was not similar", xmlDiff.similar()); + Assert.assertTrue("XML was not similar:"+xmlDiff.toString(), xmlDiff.similar()); } protected StringWriter generateFacesConfig(ComponentLibrary library) throws Exception { Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml 2010-03-09 23:46:13 UTC (rev 16544) @@ -3,7 +3,9 @@ <behavior> <behavior-id>my_behavior</behavior-id> <behavior-class>java.lang.Object</behavior-class> - <behavior-extension/> + <behavior-extension> + <cdk:generate>false</cdk:generate> + </behavior-extension> </behavior> <faces-config-extension/> </faces-config> Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml 2010-03-09 23:46:13 UTC (rev 16544) @@ -3,7 +3,9 @@ <converter> <converter-id>my_converter</converter-id> <converter-class>java.lang.Object</converter-class> - <converter-extension/> + <converter-extension> + <cdk:generate>false</cdk:generate> + </converter-extension> </converter> <faces-config-extension/> </faces-config> \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml 2010-03-09 16:53:15 UTC (rev 16543) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml 2010-03-09 23:46:13 UTC (rev 16544) @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<faces-config metadata-complete="false" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <faces-config-extension/> +<faces-config version="2.0" metadata-complete="false" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <validator> <validator-id>my_validator</validator-id> <validator-class>java.lang.Object</validator-class> - <validator-extension/> + <validator-extension> + <cdk:generate>false</cdk:generate> + </validator-extension> </validator> + <faces-config-extension/> </faces-config> \ No newline at end of file