Author: Alex.Kolonitsky Date: 2010-01-06 14:04:11 -0500 (Wed, 06 Jan 2010) New Revision: 16248 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.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/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/templatecompiler/RendererClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.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/EventAdapter.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/FacetAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.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/RenderKitIdAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.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/JAXBCopyTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java Log: https://jira.jboss.org/jira/browse/RF-8232 Tags support - rename model classes Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -44,8 +44,8 @@ import com.google.common.collect.MutableClassToInstanceMap; /** - * <p class="changed_added_4_0">Base CDK context class. Particular build tool ( Ant, Maven ) should extend that class with - * tool-specific methods.</p> + * <p class="changed_added_4_0">Base CDK context class. Particular build tool ( Ant, Maven ) should extend that + * class with tool-specific methods.</p> * @author asmirnov(a)exadel.com * */ @@ -54,17 +54,21 @@ /* Map contains writer classes for standard outputs. */ static final ImmutableMap<OutputType, Class<? extends CdkWriter>> WRITERS = - ImmutableMap.<OutputType, Class<? extends CdkWriter>>builder().put(StandardOutputs.COMPONENT_CLASSES, - ComponentClassGenerator.class).put(StandardOutputs.RENDERER_CLASSES, - RendererClassGenerator.class).put(StandardOutputs.FACES_CONFIG, - FacesConfigGenerator.class).build(); + ImmutableMap.<OutputType, Class<? extends CdkWriter>>builder() + .put(StandardOutputs.COMPONENT_CLASSES, ComponentClassGenerator.class) + .put(StandardOutputs.RENDERER_CLASSES, RendererClassGenerator.class) + .put(StandardOutputs.FACES_CONFIG, FacesConfigGenerator.class) + .build(); + /** * map contain library model builder classes for each source type. */ static final ImmutableMap<SourceType, Class<? extends ModelBuilder>> BUILDERS = - ImmutableMap.<SourceType, Class<? extends ModelBuilder>> builder().put(StandardSources.FACES_CONFIGS, - FacesConfigParser.class).put(StandardSources.JAVA_SOURCES, AptBuilder.class).put( - StandardSources.RENDERER_TEMPLATES, RendererTemplateParser.class).build(); + ImmutableMap.<SourceType, Class<? extends ModelBuilder>> builder() + .put(StandardSources.FACES_CONFIGS, FacesConfigParser.class) + .put(StandardSources.JAVA_SOURCES, AptBuilder.class) + .put(StandardSources.RENDERER_TEMPLATES, RendererTemplateParser.class) + .build(); private Map<String, String> options = Maps.newHashMap(); private Map<SourceType, Iterable<File>> sources = Maps.newHashMap(); @@ -83,6 +87,7 @@ * (non-Javadoc) * @see org.richfaces.cdk.CdkContext#getLoader() */ + @Override public CdkClassLoader getLoader() { return loader; } @@ -110,7 +115,7 @@ Iterator<OutputType> keysIterator = outputs.keySet().iterator(); while (null == outputFolder && keysIterator.hasNext()) { - OutputType outputType = (OutputType) keysIterator.next(); + OutputType outputType = keysIterator.next(); if (folderType.equals(outputType.getFolderType())) { outputFolder = outputs.get(outputType); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,10 +25,10 @@ package org.richfaces.cdk; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.RenderKit; -import org.richfaces.cdk.model.Renderer; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RendererModel; import java.util.Collection; @@ -46,7 +46,7 @@ /* * (non-Javadoc) - * @see org.richfaces.cdk.ModelValidator#verify(org.richfaces.cdk.model.ComponentLibrary) + * @see org.richfaces.cdk.ValidatorModel#verify(org.richfaces.cdk.model.ComponentLibrary) */ @Override public void verify(ComponentLibrary library) throws CdkException { @@ -58,10 +58,10 @@ } protected void verifyRenderers(ComponentLibrary library) { - for (RenderKit.Id renderKitId : library.getRenderKits().keySet()) { + for (RenderKitModel.Id renderKitId : library.getRenderKits().keySet()) { // Check render kit name and class. - RenderKit renderKit = library.getRenderKits().get(renderKitId); - for (Renderer renderer : renderKit.getRenderers()) { + RenderKitModel renderKit = library.getRenderKits().get(renderKitId); + for (RendererModel renderer : renderKit.getRenderers()) { // Check type. // Check family. @@ -76,7 +76,7 @@ protected void verifyComponents(ComponentLibrary library) throws CdkException { NamingConventions namingConventions = getNamingConventions(); - for (Component component : library.getComponents()) { + for (ComponentModel component : library.getComponents()) { // Check classes. // Check Component type. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -61,7 +61,9 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.DescriptionGroup; import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.model.Component.Type; +import org.richfaces.cdk.model.ComponentModel; +import org.richfaces.cdk.model.FacetModel; +import org.richfaces.cdk.model.ComponentModel.Type; import org.richfaces.cdk.util.Strings; import org.richfaces.cdk.xmlconfig.CdkEntityResolver; import org.richfaces.cdk.xmlconfig.FragmentParser; @@ -88,7 +90,7 @@ // value here. String type = getNamingConventions().inferComponentType(explicitType, componentElement.getQualifiedName().toString()); - org.richfaces.cdk.model.Component component = new org.richfaces.cdk.model.Component(); + ComponentModel component = new ComponentModel(); component.setType(new Type(type)); // Should that component be generated ? setClassNames(componentElement, component); @@ -107,7 +109,7 @@ } - private void setComponentProperties(TypeElement componentElement, org.richfaces.cdk.model.Component component) + private void setComponentProperties(TypeElement componentElement, ComponentModel component) throws CdkException { // Component family @@ -123,13 +125,13 @@ processAttributes(componentElement, component); } - private void processFacets(TypeElement componentElement, org.richfaces.cdk.model.Component component) { + private void processFacets(TypeElement componentElement, ComponentModel component) { SourceUtils sourceUtils = context.getWorker(SourceUtils.class); Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, componentElement); // TODO - encapsulate attribute builder into utility class. for (BeanProperty beanProperty : properties) { - org.richfaces.cdk.model.Facet facet = component.addFacet(beanProperty.getName()); + FacetModel facet = component.addFacet(beanProperty.getName()); // Documentation facet.setDescription(beanProperty.getDocComment()); @@ -167,7 +169,7 @@ } } - private void setComponentDescription(TypeElement componentElement, org.richfaces.cdk.model.Component component) { + private void setComponentDescription(TypeElement componentElement, ComponentModel component) { SourceUtils sourceUtils = context.getWorker(SourceUtils.class); // JavaDoc comments @@ -205,7 +207,7 @@ component.setIcon(iconValue); } - private void setComponeneFamily(TypeElement componentElement, org.richfaces.cdk.model.Component component) { + private void setComponeneFamily(TypeElement componentElement, ComponentModel component) { Family family = componentElement.getAnnotation(Family.class); if (null != family) { @@ -222,7 +224,7 @@ } - private void setEvents(TypeElement componentElement, org.richfaces.cdk.model.Component component) { + private void setEvents(TypeElement componentElement, ComponentModel component) { Fires fires = componentElement.getAnnotation(Fires.class); if (null != fires) { @@ -241,7 +243,7 @@ } } - private void setClassNames(TypeElement componentElement, org.richfaces.cdk.model.Component component) { + private void setClassNames(TypeElement componentElement, ComponentModel component) { Generate generate = componentElement.getAnnotation(Generate.class); // Set generated and base class names. @@ -262,7 +264,7 @@ } } - protected void processAttributes(TypeElement componentElement, final org.richfaces.cdk.model.Component component) + protected void processAttributes(TypeElement componentElement, final ComponentModel component) throws CdkException { // Process XML files with standard attributes definitions. @@ -284,8 +286,8 @@ @Override public void visit(TypeMirror type) { try { - component.getAttributes().putAll(parseProperties(CdkEntityResolver.URN_ATTRIBUTES + type.toString() - + ".xml")); + component.getAttributes().putAll(parseProperties( + CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml")); } catch (CdkException e) { // TODO - log errors ? @@ -348,7 +350,7 @@ // TODO - set method return type. } - // Behavior events. + // BehaviorModel events. EventName eventName = beanProperty.getAnnotation(EventName.class); setBehaviorEvent(attribute, eventName); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -30,7 +30,7 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.EventName; import org.richfaces.cdk.model.Property; @@ -51,7 +51,7 @@ * */ public class ComponentTemplateModel extends BeanModel implements TemplateModel { - private final Component component; + private final ComponentModel component; private Set<EventName> eventNames; /** @@ -61,7 +61,7 @@ * @param object * @param wrapper */ - public ComponentTemplateModel(Component object, BeansWrapper wrapper) { + public ComponentTemplateModel(ComponentModel object, BeansWrapper wrapper) { super(object, wrapper); component = object; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,7 +25,7 @@ package org.richfaces.cdk.freemarker; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import freemarker.ext.beans.BeansWrapper; import freemarker.template.ObjectWrapper; @@ -53,8 +53,8 @@ // TODO wrap specified model classes. TemplateModel templateModel; - if (obj instanceof Component) { - templateModel = new ComponentTemplateModel((Component) obj, this); + if (obj instanceof ComponentModel) { + templateModel = new ComponentTemplateModel((ComponentModel) obj, this); } else { templateModel = super.wrap(obj); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -31,7 +31,7 @@ import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.freemarker.FreeMarkerRenderer; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Visitable; @@ -42,7 +42,7 @@ * @author asmirnov(a)exadel.com * */ -public class ComponentClassGenerator extends FreeMarkerRenderer<Component, ComponentLibrary> implements CdkWriter { +public class ComponentClassGenerator extends FreeMarkerRenderer<ComponentModel, ComponentLibrary> implements CdkWriter { /* * (non-Javadoc) @@ -55,8 +55,8 @@ @Override protected boolean isMyComponent(Visitable c) { - if (c instanceof Component) { - Component component = (Component) c; + if (c instanceof ComponentModel) { + ComponentModel component = (ComponentModel) c; return component.isGenerate(); } @@ -65,7 +65,7 @@ } @Override - protected String getOutputFile(Component c) throws CdkException { + protected String getOutputFile(ComponentModel c) throws CdkException { return c.getComponentClass().getName().replace('.', File.separatorChar) + ".java"; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,6 +25,8 @@ import com.google.common.collect.ImmutableMap; +import java.io.Serializable; + /** * <p class="changed_added_4_0"> * Tthat class represents information about Jsf object class. @@ -32,7 +34,7 @@ * * @author asmirnov(a)exadel.com */ -public class ClassDescription { +public class ClassDescription implements Serializable { /** * <p class="changed_added_4_0"></p> 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-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlType; import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.model.RenderKit.Id; +import org.richfaces.cdk.model.RenderKitModel.Id; /** * <p class="changed_added_4_0"> @@ -67,19 +67,19 @@ * </p> */ private static final long serialVersionUID = -6055670836731899832L; - private final ModelCollection<Component> components = ModelCollection.<Component>create(); + private final ModelCollection<ComponentModel> components = ModelCollection.<ComponentModel>create(); /** * <p class="changed_added_4_0"> * JSF renderer associated with that library * </p> */ - private final ModelMap<RenderKit.Id,RenderKit> renderKits = ModelMap.<RenderKit.Id,RenderKit>create(); + private final ModelMap<RenderKitModel.Id, RenderKitModel> renderKits = ModelMap.<RenderKitModel.Id, RenderKitModel>create(); - private final ModelCollection<Converter> converters = ModelCollection.<Converter>create(); + private final ModelCollection<ConverterModel> converters = ModelCollection.<ConverterModel>create(); - private final ModelCollection<Validator> validators = ModelCollection.<Validator>create(); - private final ModelCollection<Listener> listeners = ModelCollection.<Listener>create(); + private final ModelCollection<ValidatorModel> validators = ModelCollection.<ValidatorModel>create(); + private final ModelCollection<ListenerModel> listeners = ModelCollection.<ListenerModel>create(); private long lastModified = Long.MIN_VALUE; /** @@ -87,9 +87,9 @@ * Application level events fired by the component * </p> */ - private final ModelCollection<Event> events = ModelCollection.<Event>create(); + private final ModelCollection<EventModel> events = ModelCollection.<EventModel>create(); - private final ModelCollection<Behavior> behaviors = ModelCollection.<Behavior>create(); + private final ModelCollection<BehaviorModel> behaviors = ModelCollection.<BehaviorModel>create(); private ConfigExtension extension; @@ -101,10 +101,8 @@ private final TagLibrary tagLibrary; /** - * <p class="changed_added_4_0"> - * </p> + * <p class="changed_added_4_0"></p> * - * @param baseName */ public ComponentLibrary() { this.tagLibrary = new TagLibrary(); @@ -131,13 +129,13 @@ * @param rendererType * @return */ - public RenderKit addRenderKit(String renderKitId) { - RenderKit.Id renderKitType = new RenderKit.Id(renderKitId); + public RenderKitModel addRenderKit(String renderKitId) { + RenderKitModel.Id renderKitType = new RenderKitModel.Id(renderKitId); - RenderKit renderKit = renderKits.get(renderKitType); + RenderKitModel renderKit = renderKits.get(renderKitType); if(null == renderKit){ - renderKit = new RenderKit(); + renderKit = new RenderKitModel(); renderKits.put(renderKitType, renderKit); } return renderKit; @@ -150,7 +148,7 @@ * @return the components */ @XmlElement - public Collection<Component> getComponents() { + public Collection<ComponentModel> getComponents() { return components; } @@ -160,7 +158,7 @@ * * @return the renderKits */ - public Map<Id,RenderKit> getRenderKits() { + public Map<Id, RenderKitModel> getRenderKits() { return renderKits; } @@ -170,7 +168,7 @@ * * @return the converters */ - public Collection<Converter> getConverters() { + public Collection<ConverterModel> getConverters() { return converters; } @@ -180,7 +178,7 @@ * * @return the validators */ - public Collection<Validator> getValidators() { + public Collection<ValidatorModel> getValidators() { return validators; } @@ -190,7 +188,7 @@ * * @return the behaviors */ - public Collection<Behavior> getBehaviors() { + public Collection<BehaviorModel> getBehaviors() { return behaviors; } @@ -200,7 +198,7 @@ * * @return the listeners */ - public Collection<Listener> getListeners() { + public Collection<ListenerModel> getListeners() { return listeners; } @@ -208,7 +206,7 @@ * <p class="changed_added_4_0"></p> * @return the events */ - public Collection<Event> getEvents() { + public Collection<EventModel> getEvents() { return events; } Modified: 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/Tag.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,13 +25,17 @@ package org.richfaces.cdk.model; +import java.io.Serializable; + /** * <p class="changed_added_4_0">That bean represents VDL tag</p> * @author asmirnov(a)exadel.com * */ -public class Tag { +public class Tag implements Serializable { + private static final long serialVersionUID = 3875718626199223087L; + /** * <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} Modified: 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/TagLibrary.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,14 +25,17 @@ import java.util.ArrayList; import java.util.List; +import java.io.Serializable; /** * <p class="changed_added_4_0">That bean represents whole tag library.</p> * * @author asmirnov(a)exadel.com */ -public class TagLibrary { +public class TagLibrary implements Serializable { + private static final long serialVersionUID = -3508492744326729833L; + /** * <p class="changed_added_4_0">Collection of tags associated with that library</p> */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -33,8 +33,8 @@ import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.RenderKit; -import org.richfaces.cdk.model.Renderer; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.xmlconfig.JAXBBinding; @@ -84,8 +84,8 @@ @Override public void render() throws CdkException { ComponentLibrary library = context.getLibrary(); - for (RenderKit renderKit : library.getRenderKits().values()) { - for (Renderer renderer : renderKit.getRenderers()) { + for (RenderKitModel renderKit : library.getRenderKits().values()) { + for (RendererModel renderer : renderKit.getRenderers()) { Template template = renderer.getTemplate(); if (null != template) { RendererClassVisitor visitor = new RendererClassVisitor( Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -31,8 +31,8 @@ import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.RenderKit; -import org.richfaces.cdk.model.Renderer; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.templatecompiler.model.CompositeInterface; import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.xmlconfig.JAXBBinding; @@ -58,8 +58,8 @@ Template template = parseTemplate(file); CompositeInterface compositeInterface = template.getInterface(); // TODO - infer values ? - RenderKit renderKit = library.addRenderKit(compositeInterface.getRenderKitId()); - Renderer renderer = new Renderer(new Renderer.Type(compositeInterface.getRendererType())); + RenderKitModel renderKit = library.addRenderKit(compositeInterface.getRenderKitId()); + RendererModel renderer = new RendererModel(new RendererModel.Type(compositeInterface.getRendererType())); renderKit.getRenderers().add(renderer); String componentType = compositeInterface.getComponentType(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; +import java.io.Serializable; /** * <p class="changed_added_4_0"></p> @@ -32,8 +33,10 @@ * @author asmirnov(a)exadel.com */ @XmlType(name = "uicomponent-attributeType", namespace = Template.COMPOSITE_NAMESPACE) -public class Attribute { +public class Attribute implements Serializable { + private static final long serialVersionUID = -8183353368681247171L; + @XmlAttribute(required = true) private String name; @@ -166,7 +169,7 @@ /** * <p class="changed_added_4_0"></p> * - * @param targets the targets to set + * @param applyTo the targets to set */ public void setTargets(String applyTo) { this.targets = applyTo; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -24,6 +24,7 @@ package org.richfaces.cdk.templatecompiler.model; import javax.xml.bind.annotation.XmlType; +import java.io.Serializable; /** * <p class="changed_added_4_0"></p> @@ -31,6 +32,7 @@ * @author asmirnov(a)exadel.com */ @XmlType(name = "ImplementationType", namespace = Template.COMPOSITE_NAMESPACE) -public class CompositeImplementation extends ModelFragment { +public class CompositeImplementation extends ModelFragment implements Serializable { + private static final long serialVersionUID = -3046226976516170979L; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlType; import java.util.List; +import java.io.Serializable; /** * <p class="changed_added_4_0"></p> @@ -35,8 +36,10 @@ * @author asmirnov(a)exadel.com */ @XmlType(name = "InterfaceType", namespace = Template.COMPOSITE_NAMESPACE) -public class CompositeInterface { +public class CompositeInterface implements Serializable { + private static final long serialVersionUID = -5578359507253872500L; + private String componentType; private String componentFamily; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -24,14 +24,17 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import java.text.MessageFormat; +import java.io.Serializable; /** * @author Nick Belaevski * @since 4.0 */ @XmlType(name = "resourceDependencyType", namespace = Template.CDK_NAMESPACE) -public class ResourceDependency { +public class ResourceDependency implements Serializable { + private static final long serialVersionUID = -7513798674871079584L; + private String name; private String library; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; /** * <p class="changed_added_4_0"></p> @@ -32,7 +33,7 @@ * @author asmirnov(a)exadel.com */ @XmlRootElement(name = "root", namespace = Template.CDK_NAMESPACE) -public class Template { +public class Template implements Serializable { public static final String JSTL_CORE_NAMESPACE = "http://richfaces.org/cdk/jstl/core"; @@ -40,6 +41,8 @@ public static final String COMPOSITE_NAMESPACE = "http://richfaces.org/cdk/jsf/composite"; + private static final long serialVersionUID = -6900382133123748812L; + private CompositeInterface compositeInterface; private CompositeImplementation compositeImplementation; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -31,7 +31,7 @@ import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWorker; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Property; import org.richfaces.cdk.xmlconfig.model.ComponentAdapter; @@ -76,7 +76,7 @@ Class<Fragment> bindClass = Fragment.class; Fragment unmarshal = getBinding().unmarshal(url, schemaLocation, bindClass); if(null != unmarshal ){ - Component component = adapter.unmarshal(unmarshal); + ComponentModel component = adapter.unmarshal(unmarshal); return component.getAttributes(); } else { return Collections.<String, Property>emptyMap(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -23,7 +23,7 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.Attribute; +import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.Property; /** @@ -35,12 +35,12 @@ @Override protected Class<? extends PropertyBase> getBeanClass(Property prop) { - return prop instanceof Attribute?AttributeBean.class:PropertyBean.class; + return prop instanceof AttributeModel ?AttributeBean.class:PropertyBean.class; } @Override protected Class<? extends Property> getModelClass(PropertyBase bean) { - return bean instanceof AttributeBean?Attribute.class:Property.class; + return bean instanceof AttributeBean? AttributeModel.class:Property.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -24,8 +24,8 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.model.Component.Type; +import org.richfaces.cdk.model.ComponentModel; +import org.richfaces.cdk.model.ComponentModel.Type; /** @@ -33,31 +33,31 @@ * * @author asmirnov(a)exadel.com */ -public class ComponentAdapter extends AdapterBase<ComponentBean, Component> { +public class ComponentAdapter extends AdapterBase<ComponentBean, ComponentModel> { private static final AttributeAdapter ATTRIBUTE_ADAPTER = new AttributeAdapter(); private static final FacetAdapter FACET_ADAPTER = new FacetAdapter(); @Override - protected Class<? extends ComponentBean> getBeanClass(Component c) { + protected Class<? extends ComponentBean> getBeanClass(ComponentModel c) { return ComponentBean.class; } @Override - protected Class<? extends Component> getModelClass(ComponentBean b) { - return Component.class; + protected Class<? extends ComponentModel> getModelClass(ComponentBean b) { + return ComponentModel.class; } @Override - protected void postMarshal(Component model, ComponentBean bean) { + protected void postMarshal(ComponentModel model, ComponentBean bean) { // Copy properties/attributes bean.setAttributes(marshalMap(model.getAttributes(),ATTRIBUTE_ADAPTER)); bean.setFacets(marshalMap(model.getFacets(),FACET_ADAPTER)); } @Override - protected void postUnmarshal(ComponentBean bean,Component model) { + protected void postUnmarshal(ComponentBean bean, ComponentModel model) { // Copy type. String type = bean.getType(); if(null != type){ 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-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -33,7 +33,7 @@ import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.Event; +import org.richfaces.cdk.model.EventModel; import com.google.common.collect.Lists; @@ -157,7 +157,7 @@ public static class ComponentExtension extends ConfigExtension { private List<String> rendererTypes = Lists.newArrayList(); - private List<Event> events = Lists.newArrayList(); + private List<EventModel> events = Lists.newArrayList(); private ClassDescription baseClass; private String family; private boolean generate; @@ -246,7 +246,7 @@ */ @XmlElement(name = "fires", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @XmlJavaTypeAdapter(EventAdapter.class) - public List<Event> getEvents() { + public List<EventModel> getEvents() { return events; } @@ -255,7 +255,7 @@ * * @param events the events to set */ - public void setEvents(List<Event> events) { + public void setEvents(List<EventModel> events) { this.events = events; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -23,23 +23,23 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.Event; +import org.richfaces.cdk.model.EventModel; /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public class EventAdapter extends AdapterBase<EventBean, Event> { +public class EventAdapter extends AdapterBase<EventBean, EventModel> { @Override - protected Class<? extends EventBean> getBeanClass(Event model) { + protected Class<? extends EventBean> getBeanClass(EventModel model) { return EventBean.class; } @Override - protected Class<? extends Event> getModelClass(EventBean bean) { - return Event.class; + protected Class<? extends EventModel> getModelClass(EventBean bean) { + return EventModel.class; } } 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-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.Event; +import org.richfaces.cdk.model.EventModel; import org.richfaces.cdk.model.Extensible; import com.google.common.collect.Lists; @@ -49,7 +49,7 @@ public class FacesConfigBean implements Extensible<FacesConfigBean.FacesConfigExtension> { @XmlElement(name = "component", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlJavaTypeAdapter(ComponentAdapter.class) - private List<Component> components = Lists.newArrayList(); + private List<ComponentModel> components = Lists.newArrayList(); @XmlElement(name = "render-kit", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) private List<RenderKitBean> renderKits = Lists.newArrayList(); @XmlAttribute @@ -98,7 +98,7 @@ * * @return the components */ - public List<Component> getComponents() { + public List<ComponentModel> getComponents() { return components; } @@ -107,7 +107,7 @@ * * @param components the components to set */ - public void setComponents(List<Component> components) { + public void setComponents(List<ComponentModel> components) { this.components = components; } @@ -148,11 +148,11 @@ } public static final class FacesConfigExtension extends ConfigExtension { - private List<Event> events = Lists.newArrayList(); + private List<EventModel> events = Lists.newArrayList(); @XmlElement(name = "faces-event", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @XmlJavaTypeAdapter(EventAdapter.class) - public List<Event> getEvents() { + public List<EventModel> getEvents() { return events; } @@ -161,7 +161,7 @@ * * @param events the events to set */ - public void setEvents(List<Event> events) { + public void setEvents(List<EventModel> events) { this.events = events; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -23,22 +23,22 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.Facet; +import org.richfaces.cdk.model.FacetModel; /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public class FacetAdapter extends AdapterBase<FacetBean, Facet> { +public class FacetAdapter extends AdapterBase<FacetBean, FacetModel> { @Override - protected Class<? extends FacetBean> getBeanClass(Facet model) { + protected Class<? extends FacetBean> getBeanClass(FacetModel model) { return FacetBean.class; } @Override - protected Class<? extends Facet> getModelClass(FacetBean bean) { - return Facet.class; + protected Class<? extends FacetModel> getModelClass(FacetBean bean) { + return FacetModel.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -23,22 +23,22 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.RenderKit; +import org.richfaces.cdk.model.RenderKitModel; /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public class RenderKitAdapter extends AdapterBase<RenderKitBean, RenderKit> { +public class RenderKitAdapter extends AdapterBase<RenderKitBean, RenderKitModel> { @Override - protected Class<? extends RenderKitBean> getBeanClass(RenderKit model) { + protected Class<? extends RenderKitBean> getBeanClass(RenderKitModel model) { return RenderKitBean.class; } @Override - protected Class<? extends RenderKit> getModelClass(RenderKitBean bean) { - return RenderKit.class; + protected Class<? extends RenderKitModel> getModelClass(RenderKitBean bean) { + return RenderKitModel.class; } } 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-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -34,9 +34,9 @@ import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.RenderKit; -import org.richfaces.cdk.model.Renderer; -import org.richfaces.cdk.model.RenderKit.Id; +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; @@ -47,9 +47,9 @@ */ @XmlType(name="faces-config-render-kitType",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE, propOrder={"key","renderkitClass","renderers","behaviorRenderers","extension"}) -public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> implements MapEntry<RenderKit.Id> { +public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> implements MapEntry<RenderKitModel.Id> { - private List<Renderer> renderers = Lists.newArrayList(); + private List<RendererModel> renderers = Lists.newArrayList(); private List<BehaviorRenderer> behaviorRenderers = Lists.newArrayList(); private ClassDescription renderkitClass; private Id key = new Id(RenderKitFactory.HTML_BASIC_RENDER_KIT); @@ -94,7 +94,7 @@ */ @XmlElement(name = "renderer", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlJavaTypeAdapter(RendererAdapter.class) - public List<Renderer> getRenderers() { + public List<RendererModel> getRenderers() { return renderers; } @@ -103,7 +103,7 @@ * * @param renderers the renderers to set */ - public void setRenderers(List<Renderer> renderers) { + public void setRenderers(List<RendererModel> renderers) { this.renderers = renderers; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,15 +25,15 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; -import org.richfaces.cdk.model.RenderKit; -import org.richfaces.cdk.model.RenderKit.Id; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RenderKitModel.Id; /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com * */ -public class RenderKitIdAdapter extends XmlAdapter<String, RenderKit.Id>{ +public class RenderKitIdAdapter extends XmlAdapter<String, RenderKitModel.Id>{ @Override public String marshal(Id v) throws Exception { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -23,8 +23,8 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.Renderer; -import org.richfaces.cdk.model.Renderer.Type; +import org.richfaces.cdk.model.RendererModel; +import org.richfaces.cdk.model.RendererModel.Type; /** * <p class="changed_added_4_0"> @@ -32,24 +32,24 @@ * * @author asmirnov(a)exadel.com */ -public class RendererAdapter extends AdapterBase<RendererBean, Renderer> { +public class RendererAdapter extends AdapterBase<RendererBean, RendererModel> { @Override - protected Class<? extends RendererBean> getBeanClass(Renderer model) { + protected Class<? extends RendererBean> getBeanClass(RendererModel model) { return RendererBean.class; } @Override - protected Class<? extends Renderer> getModelClass(RendererBean bean) { - return Renderer.class; + protected Class<? extends RendererModel> getModelClass(RendererBean bean) { + return RendererModel.class; } @Override - protected void postMarshal(Renderer model, RendererBean bean) { + protected void postMarshal(RendererModel model, RendererBean bean) { } @Override - protected void postUnmarshal(RendererBean bean, Renderer model) { + protected void postUnmarshal(RendererBean bean, RendererModel model) { // Copy type. String type = bean.getType(); if (null != type) { 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-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.richfaces.cdk.model.Attribute; +import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; @@ -48,7 +48,7 @@ public class RendererBean extends ExtensibleBean<RendererBean.RendererExtension> { - private List<Attribute> attributes = Lists.newArrayList(); + private List<AttributeModel> attributes = Lists.newArrayList(); private String family; private ClassDescription rendererClass; private String type; @@ -124,7 +124,7 @@ * @return the attributes */ @XmlElement(name = "attribute", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = AttributeBean.class) - public List<Attribute> getAttributes() { + public List<AttributeModel> getAttributes() { return this.attributes; } @@ -134,7 +134,7 @@ * * @param attributes the attributes to set */ - public void setAttributes(List<Attribute> attributes) { + public void setAttributes(List<AttributeModel> attributes) { this.attributes = attributes; } Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -43,7 +43,7 @@ import org.richfaces.cdk.RichFacesConventions; import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.annotations.Family; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Property; import org.richfaces.cdk.xmlconfig.FragmentParser; @@ -85,11 +85,11 @@ verify(cdkContext); ComponentLibrary library = cdkContext.getLibrary(); - Collection<Component> components = library.getComponents(); + Collection<ComponentModel> components = library.getComponents(); assertEquals(1, components.size()); - Component component = Iterables.get(components, 0); + ComponentModel component = Iterables.get(components, 0); Map<String, Property> attributes = component.getAttributes(); assertEquals(17, attributes.size()); @@ -117,11 +117,11 @@ verify(cdkContext); ComponentLibrary library = cdkContext.getLibrary(); - Collection<Component> components = library.getComponents(); + Collection<ComponentModel> components = library.getComponents(); assertEquals(1, components.size()); - Component component = Iterables.get(components, 0); + ComponentModel component = Iterables.get(components, 0); Map<String, Property> attributes = component.getAttributes(); assertEquals(15, attributes.size()); @@ -146,7 +146,7 @@ JAXBBinding jaxbBinding = new JAXBBinding(); expect(cdkContext.getWorker(JAXBBinding.class)).andStubReturn(jaxbBinding); - expect(cdkContext.setWorker(SourceUtils.class,(SourceUtils)anyObject())).andStubReturn(null); + expect(cdkContext.setWorker(eq(SourceUtils.class), (SourceUtils) anyObject())).andStubReturn(null); replay(cdkContext); richFacesConventions.init(cdkContext); jaxbBinding.init(cdkContext); @@ -157,7 +157,7 @@ protected CdkClassLoader createClassLoader() throws Exception { return new CdkClassLoader(ImmutableList.of(getLibraryFile("test.source.properties"), - getLibraryFile(Component.class), + getLibraryFile(ComponentModel.class), getLibraryFile(ELContext.class), getLibraryFile(Family.class), getLibraryFile(UIComponent.class)), Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -12,7 +12,7 @@ import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.CdkContext.OutputType; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.Visitable; public class FreeMarkerRendererTest extends CdkTestBase { @@ -25,14 +25,14 @@ @Test public void testProcessComponent() throws Exception { final StringWriter output = new StringWriter(); - Component component = new Component(new Component.Type("foo.Bar")); - FreeMarkerRenderer<Component, Boolean> renderer = new FreeMarkerRenderer<Component, Boolean>() { + ComponentModel component = new ComponentModel(new ComponentModel.Type("foo.Bar")); + FreeMarkerRenderer<ComponentModel, Boolean> renderer = new FreeMarkerRenderer<ComponentModel, Boolean>() { @Override - protected String getOutputFile(Component c) { + protected String getOutputFile(ComponentModel c) { return null; } @Override - protected Writer getOutput(Component c) throws CdkException { + protected Writer getOutput(ComponentModel c) throws CdkException { return output; } @Override Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -39,7 +39,7 @@ import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.EventName; import org.richfaces.cdk.model.Property; @@ -52,7 +52,7 @@ public class ComponentClassGeneratorTest extends CdkTestBase { /** - * Test method for {@link org.richfaces.cdk.generate.java.ComponentClassGenerator#getOutputFile(org.richfaces.cdk.model.Component)}. + * Test method for {@link org.richfaces.cdk.generate.java.ComponentClassGenerator#getOutputFile(org.richfaces.cdk.model.ComponentModel)}. * @throws Exception */ @Test @@ -60,7 +60,7 @@ final StringWriter output = new StringWriter(); ComponentClassGenerator generator = new ComponentClassGenerator() { @Override - protected Writer getOutput(Component c) throws CdkException { + protected Writer getOutput(ComponentModel c) throws CdkException { return output; } }; @@ -69,7 +69,7 @@ generator.init(mockContext); ComponentLibrary library = new ComponentLibrary(); - Component component = new Component(new Component.Type("foo.bar")); + ComponentModel component = new ComponentModel(new ComponentModel.Type("foo.bar")); library.getComponents().add(component); component.setGenerate(true); component.setBaseClass(new ClassDescription(UIOutput.class)); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -34,8 +34,6 @@ import org.junit.Test; -import org.richfaces.cdk.CdkException; - /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com @@ -50,7 +48,7 @@ @Test public void testAcceptLibraryVisitorOfRPP() throws Exception { ComponentLibrary lib = new ComponentLibrary(); - final Component component = new Component(new Component.Type("foo.Bar")); + final ComponentModel component = new ComponentModel(new ComponentModel.Type("foo.Bar")); lib.getComponents().add(component); LibraryVisitor<Boolean, Boolean> visitor = new LibraryVisitor<Boolean, Boolean>() { @Override @@ -68,7 +66,7 @@ @Test public void testFindOrCreateRenderKit() { ComponentLibrary lib = new ComponentLibrary(); - RenderKit renderKit = lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT); + RenderKitModel renderKit = lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT); assertNotNull(renderKit); assertSame(renderKit, lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT)); 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-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -25,7 +25,6 @@ import static org.junit.Assert.*; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -33,11 +32,11 @@ import org.richfaces.cdk.CdkContextBase; import org.richfaces.cdk.CdkTestBase; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.Facet; +import org.richfaces.cdk.model.FacetModel; import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.model.RenderKit; +import org.richfaces.cdk.model.RenderKitModel; import org.richfaces.cdk.xmlconfig.model.FacesConfigBean; import org.richfaces.cdk.xmlconfig.model.RenderKitBean; @@ -60,7 +59,7 @@ assertEquals(1, library.getComponents().size()); - Component component = library.getComponents().get(0); + ComponentModel component = library.getComponents().get(0); assertEquals("javax.faces.Panel", component.getType().toString()); assertEquals("javax.faces.Panel", component.getFamily()); @@ -71,7 +70,7 @@ assertEquals("Panel", component.getDisplayname()); assertTrue(component.isGenerate()); - Facet facet = Iterables.getOnlyElement(component.getFacets().values()); + FacetModel facet = Iterables.getOnlyElement(component.getFacets().values()); String key = Iterables.getOnlyElement(component.getFacets().keySet()); assertEquals("header", key); assertEquals("Header facet", facet.getDescription()); @@ -90,8 +89,8 @@ ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION, FacesConfigBean.class); List<RenderKitBean> renderKits = library.getRenderKits(); assertEquals(2, renderKits.size()); - assertEquals(new RenderKit.Id("HTML_BASIC"), renderKits.get(0).getKey()); - assertEquals(new RenderKit.Id("RDFa"), renderKits.get(1).getKey()); + assertEquals(new RenderKitModel.Id("HTML_BASIC"), renderKits.get(0).getKey()); + assertEquals(new RenderKitModel.Id("RDFa"), renderKits.get(1).getKey()); } /** Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -6,10 +6,8 @@ import org.junit.Test; -import org.richfaces.cdk.CdkException; import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.xmlconfig.model.ComponentBean; import org.richfaces.cdk.xmlconfig.model.PropertyBase; import org.richfaces.cdk.xmlconfig.model.ComponentBean.ComponentExtension; @@ -23,7 +21,7 @@ @Test public void testCreateAdapter() throws Exception { - Component component = new Component(new Component.Type(FOO_BAR)); + ComponentModel component = new ComponentModel(new ComponentModel.Type(FOO_BAR)); component.setDescription(FOO_DESCTIPTION); component.setComponentClass(new ClassDescription(FOO_UI_BAR)); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java 2010-01-06 18:11:51 UTC (rev 16247) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java 2010-01-06 19:04:11 UTC (rev 16248) @@ -1,7 +1,5 @@ package org.richfaces.cdk.xmlconfig; -import static org.junit.Assert.*; - import java.io.StringWriter; import javax.xml.transform.stream.StreamResult; @@ -9,11 +7,10 @@ import org.junit.Test; import org.richfaces.cdk.CdkContextBase; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.RenderKit; -import org.richfaces.cdk.model.Renderer; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; public class JaxbMarshalTest extends JaxbTestBase { @@ -25,10 +22,10 @@ jaxbBinding.init(contextBase); ComponentLibrary library = new ComponentLibrary(); - Component component = new Component( new Component.Type("foo.bar")); + ComponentModel component = new ComponentModel( new ComponentModel.Type("foo.bar")); library.getComponents().add(component); - RenderKit renderKit = library.addRenderKit("HTML"); - Renderer renderer = new Renderer(new Renderer.Type("foo.Renderer")); + RenderKitModel renderKit = library.addRenderKit("HTML"); + RendererModel renderer = new RendererModel(new RendererModel.Type("foo.Renderer")); renderKit.getRenderers().add(renderer); StringWriter writer = new StringWriter();