[richfaces-svn-commits] JBoss Rich Faces SVN: r1391 - in branches/refactor1: cdk and 158 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Thu Jun 28 17:15:48 EDT 2007


Author: alexsmirnov
Date: 2007-06-28 17:15:47 -0400 (Thu, 28 Jun 2007)
New Revision: 1391

Added:
   branches/refactor1/cdk/generator/target/
   branches/refactor1/cdk/generator/target/classes/
   branches/refactor1/cdk/generator/target/classes/META-INF/
   branches/refactor1/cdk/generator/target/classes/META-INF/plexus/
   branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/tags.bin
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm
   branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm
   branches/refactor1/cdk/generator/target/classes/VM_global_library.vm
   branches/refactor1/cdk/generator/target/classes/org/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/AntLogger.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/JSFGeneratorTask.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/VCPVersionTask.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig$1.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBaseBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ConverterBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/EventBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/JsfBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ListenerBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/LoaderHolder.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ParsingException.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/PropertyBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/RendererBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagHandlerBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TestClassHolder.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ValidatorBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder$1.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/BlankRendererGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet$PatternEntry.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTagGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTestGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterTagGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FaceletsTaglibGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FacesConfigGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GeneratorException.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GetResourceInterceptor.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/InnerGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/JSFGeneratorConfiguration.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ListenerGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/Logger.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RenderKitBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererCompilationContext.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagHandlerGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagTestGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TaglibGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TestDataGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorTagGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/XMLConfigGenerator.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/AntFileResourceLoader.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/BuilderContext.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/ClasspathTemplateLoader.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/ArrayNodeList.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody$1.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationContext.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationException.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/StringUtils.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/Variable.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL$containedClass.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELCompiler.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELParser.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ICompiledEL.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/IELCompiler.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/Attribute.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/BodyElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/DeclarationElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsArray.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsFactory.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/RootElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CommentElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/PIElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/TextElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Expression.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/CallbackListener.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.class
   branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/BuilderContext.class
   branches/refactor1/cdk/generator/target/generator-3.1.0-SNAPSHOT.jar
   branches/refactor1/cdk/generator/target/surefire-reports/
   branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml
   branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml
   branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml
   branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt
   branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt
   branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt
   branches/refactor1/cdk/generator/target/test-classes/
   branches/refactor1/cdk/generator/target/test-classes/org/
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/AppTest.class
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClass.class
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest$Proxy.class
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest.class
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseClass.class
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseInterface.class
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/ClassPatternSetTest.class
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/
   branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/XMLBodyTest.class
   branches/refactor1/cdk/generator/target/test-classes/test/
   branches/refactor1/cdk/generator/target/test-classes/test/TestComponent.class
   branches/refactor1/cdk/maven-archetype-jsf-component/target/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/README
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/README
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/README
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/
   branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java
   branches/refactor1/cdk/maven-archetype-jsf-component/target/maven-archetype-jsf-component-3.1.0-SNAPSHOT.jar
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java
   branches/refactor1/cdk/maven-archetype-jsfwebapp/target/maven-archetype-jsfwebapp-3.1.0-SNAPSHOT.jar
   branches/refactor1/cdk/maven-cdk-plugin/target/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenCompilationContext.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenLogger.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AbstractCDKMojo.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CompileMojo.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CreateComponentMojo.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$1.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$2.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateTestMojo.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Library.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Renderkit.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Taglib.class
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm
   branches/refactor1/cdk/maven-cdk-plugin/target/maven-cdk-plugin-3.1.0-SNAPSHOT.jar
   branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml
   branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t
   branches/refactor1/framework/pom.xml
Modified:
   branches/refactor1/cdk/generator/pom.xml
   branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml
   branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
   branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml
   branches/refactor1/cdk/maven-cdk-plugin/pom.xml
   branches/refactor1/cdk/pom.xml
   branches/refactor1/docs/ajaxguide/en/pom.xml
   branches/refactor1/docs/ajaxguide/pom.xml
   branches/refactor1/docs/maven-docbook-plugin/pom.xml
   branches/refactor1/docs/pom.xml
   branches/refactor1/docs/userguide/en/pom.xml
   branches/refactor1/docs/userguide/pom.xml
   branches/refactor1/docs/xslt/pom.xml
   branches/refactor1/extensions/gwt/pom.xml
   branches/refactor1/extensions/portlet/pom.xml
   branches/refactor1/extensions/seam/pom.xml
   branches/refactor1/extensions/trinidad/pom.xml
   branches/refactor1/framework/impl/pom.xml
   branches/refactor1/pom.xml
   branches/refactor1/samples/ajaxPortlet/pom.xml
   branches/refactor1/samples/portal-echo/pom.xml
   branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml
   branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml
   branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml
   branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml
   branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml
   branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/pom.xml
   branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml
   branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/skins/pom.xml
   branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml
   branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml
   branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml
   branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml
   branches/refactor1/sandbox/pom.xml
   branches/refactor1/sandbox/samples/calendar-sample/pom.xml
   branches/refactor1/sandbox/samples/panel2-sample/pom.xml
   branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml
   branches/refactor1/sandbox/samples/pom.xml
   branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml
   branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml
   branches/refactor1/sandbox/samples/tooltip-sample/pom.xml
   branches/refactor1/sandbox/tooltip/pom.xml
   branches/refactor1/sandbox/ui/calendar/pom.xml
   branches/refactor1/sandbox/ui/panel2/pom.xml
   branches/refactor1/sandbox/ui/panelmenu/pom.xml
   branches/refactor1/sandbox/ui/scrollable-grid/pom.xml
   branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml
   branches/refactor1/ui/assembly/pom.xml
   branches/refactor1/ui/common/pom.xml
   branches/refactor1/ui/dataFilterSlider/pom.xml
   branches/refactor1/ui/dataTable/pom.xml
   branches/refactor1/ui/datascroller/pom.xml
   branches/refactor1/ui/drag-drop/pom.xml
   branches/refactor1/ui/dropdown-menu/pom.xml
   branches/refactor1/ui/gmap/pom.xml
   branches/refactor1/ui/inputnumber-slider/pom.xml
   branches/refactor1/ui/inputnumber-spinner/pom.xml
   branches/refactor1/ui/menu-components/pom.xml
   branches/refactor1/ui/modal-panel/pom.xml
   branches/refactor1/ui/paint2D/pom.xml
   branches/refactor1/ui/panel/pom.xml
   branches/refactor1/ui/panelbar/pom.xml
   branches/refactor1/ui/pom.xml
   branches/refactor1/ui/separator/pom.xml
   branches/refactor1/ui/simpleTogglePanel/pom.xml
   branches/refactor1/ui/spacer/pom.xml
   branches/refactor1/ui/suggestionbox/pom.xml
   branches/refactor1/ui/tabPanel/pom.xml
   branches/refactor1/ui/togglePanel/pom.xml
   branches/refactor1/ui/toolBar/pom.xml
   branches/refactor1/ui/tree/pom.xml
Log:
continue refactored

Modified: branches/refactor1/cdk/generator/pom.xml
===================================================================
--- branches/refactor1/cdk/generator/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/cdk/generator/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,14 +1,13 @@
 <?xml version="1.0"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cdk</artifactId>
-    <groupId>org.ajax4jsf</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <groupId>org.richfaces</groupId>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ajax4jsf.cdk</groupId>
+  <groupId>org.richfaces.cdk</groupId>
   <artifactId>generator</artifactId>
   <name>Java Server Faces component generator</name>
-  <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/generator</url>
   <build>
     <plugins>
       <plugin>
@@ -59,26 +58,24 @@
       <version>2.1</version>
     </dependency>
     <dependency>
+      <groupId>javax.el</groupId>
+      <artifactId>el-api</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>el-impl</groupId>
+      <artifactId>el-impl</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
       <groupId>qdox</groupId>
       <artifactId>qdox</artifactId>
       <version>1.6</version>
     </dependency>
     <dependency>
-      <groupId>org.ajax4jsf.cdk</groupId>
-      <artifactId>compiler</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
       <version>2.1_3</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,18 @@
+<component-set>
+	<components>
+		<component>
+			<role>org.ajax4jsf.templatecompiler.elements.ElementsFactory</role>
+      		<role-hint>a4j</role-hint>
+			<implementation>
+				org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory
+			</implementation>
+		</component>
+		<component>
+			<role>org.ajax4jsf.templatecompiler.elements.ElementsFactory</role>
+      		<role-hint>jstl</role-hint>
+			<implementation>
+				org.ajax4jsf.templatecompiler.elements.JSTLElementsFactory
+			</implementation>
+		</component>
+	</components>
+</component-set>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,249 @@
+<!-- Defenition of component configuration for generator 
+	PUBLIC-ID "-//AJAX4JSF//CDK Generator config/EN"
+	SYSTEM-ID https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd -->
+<!-- Root element for components and renderers  -->	
+<!ELEMENT components (component*,renderer*,listener*,validator*,converter*) >
+<!-- Component description with common properties, tags and renderers descriptions  -->	
+<!ELEMENT component (name,family?,classname?,superclass?,test*,description?,displayname?,icon?,facet*,renderer*,tag?,taghandler?,(include|properties|property)*)>
+<!-- Validator description with properties and tags -->
+<!ELEMENT validator (name,classname?,superclass?,test*,description?,displayname?,icon?,tag?,taghandler?,(include|properties|property)*)>
+<!-- Validator description with properties and tags -->
+<!ELEMENT converter (name,classname?,superclass?,test*,description?,displayname?,icon?,tag?,taghandler?,(include|properties|property)*)>
+
+<!-- components with generate=false not produce component class, 
+     use for describe superclasses for other components -->
+<!ATTLIST component
+	generate (true|false) "true" 
+	>
+	
+<!-- validators with generate=false do not generate a class -->
+<!ATTLIST validator
+	generate (true|false) "true" 
+	>
+	
+<!-- converters with generate=false do not generate a class -->
+<!ATTLIST converter
+	generate (true|false) "true" 
+	>
+
+<!-- Common component parameters -->
+<!-- Name of component/renderer/property -->
+<!ELEMENT name (#PCDATA)>
+<!-- Id of the validator/converter -->
+<!ELEMENT id (#PCDATA)>
+<!-- Component family -->
+<!ELEMENT family (#PCDATA)>
+<!-- Element Description for config files -->
+<!ELEMENT description ANY>
+<!-- Element Dispaly name , for config files -->
+<!ELEMENT displayname ANY>
+<!-- Element icon image , for config files -->
+<!ELEMENT icon (#PCDATA)>
+<!-- component allowed facet  name , for config files -->
+<!ELEMENT facet (name,displayname?,description?)>
+<!-- Full name of Java class -->
+<!ELEMENT classname (#PCDATA)>
+<!-- Full name of Java super class -->
+<!ELEMENT superclass (#PCDATA)>
+<!-- Define renderer for this component -->
+<!ELEMENT renderer (name,(classname|template),superclass?,description?,displayname?,icon?,facet?,renderkit?)>
+<!-- Define render kit Id for renderer -->
+<!ELEMENT renderkit (#PCDATA)>
+<!-- Template file name -->
+<!ELEMENT template (#PCDATA)>
+
+<!ATTLIST renderer
+	generate (true|false) "false" 
+	override (true|false) "false" 
+	>
+
+<!-- Define JSP tag for this component -->
+<!ELEMENT tag (name,classname,superclass?,test*,taglib?,description?,displayname?,icon?)>
+<!ATTLIST tag
+	generate (true|false) "true" 
+	bodyContent (JSP|empty) "JSP" 
+	>
+
+<!ELEMENT test (classname?,superclassname?)>
+<!--!ELEMENT classname (#PCDATA)-->
+<!ELEMENT superclassname (#PCDATA)>
+
+<!-- Define JSP tag for this component -->
+<!ELEMENT taghandler (name?,classname,superclass?,description?,displayname?,icon?)>
+<!ATTLIST taghandler
+	generate (true|false) "false" 
+	>
+
+<!ELEMENT listener (name,listenerclass,componentclass,eventclass,methodname?,tag?,taghandler?,property*)>
+
+<!ELEMENT listenerclass (#PCDATA)>
+<!ELEMENT eventclass (#PCDATA)>
+<!ELEMENT componentclass (#PCDATA)>
+<!ELEMENT methodname (#PCDATA)>
+
+<!-- Short name of taglib for this tag - for generate set of taglibs in single task -->
+<!ELEMENT taglib (#PCDATA)>
+
+<!-- proprties group for included entity -->
+<!ELEMENT properties ((include|properties|property)*)>
+
+<!-- Define single property for this component -->
+<!ELEMENT property (name,classname?,description?,defaultvalue?,methodargs?,alias*)>
+
+<!-- default value for property -->
+<!ELEMENT defaultvalue (#PCDATA)>
+
+<!-- comma-separated list of method call parameters classes for Method-binded property -->
+<!ELEMENT methodargs (#PCDATA)>
+
+<!-- alias for property in JSP tag -->
+<!ELEMENT alias (#PCDATA)>
+
+<!ATTLIST property 
+	el (true|false) "true"
+	elonly (true|false) "false"
+	hidden (true|false) "false"
+	exist (true|false) "false"
+	raw (true|false) "false"
+	existintag (true|false) "false"
+	attachedstate (true|false) "false"
+	transient (true|false) "false"
+	hidden (true|false) "false"
+	required (true|false) "false"
+	disabled (true|false) "false"	
+	>
+<!-- include pre-defined properties set -->
+<!ELEMENT include EMPTY >
+<!ATTLIST include 
+      href CDATA #REQUIRED
+>
+
+<!-- pre-defined entities for common components properties -->
+<!ENTITY html_attributes   PUBLIC "html_universal_attributes" "entities/html_universal_attributes.ent">	
+<!-- pre-defined entities for common component events -->
+<!ENTITY html_events   PUBLIC "html_events" "entities/html_events.ent">	
+<!-- pre-defined entities for common controls' events -->
+<!ENTITY html_control_events   PUBLIC "html_control_events" "entities/html_control_events.ent">	
+<!-- -->
+<!ENTITY ajax_region_attributes PUBLIC "ajax_region_attributes" "entities/ajax_region_attributes.ent">
+<!-- -->
+<!ENTITY ajax_component_attributes PUBLIC "ajax_component_attributes" "entities/ajax_component_attributes.ent">
+<!-- -->
+<!ENTITY ajax_output_attributes PUBLIC "ajax_output_attributes" "entities/ajax_output_attributes.ent">
+<!-- -->
+<!ENTITY ajax_dnd_attributes PUBLIC "ajax_dnd_attributes" "entities/ajax_dnd_attributes.ent">
+<!-- -->
+<!ENTITY dropzone_attributes PUBLIC "dropzone_attributes" "entities/dropzone_attributes.ent">
+<!-- -->
+<!ENTITY draggable_attributes PUBLIC "draggable_attributes" "entities/draggable_attributes.ent">
+
+<!-- imported from myfaces -->
+
+<!-- -->
+<!ENTITY validator_min_max_attributes PUBLIC "validator_min_max_attributes" "entities/validator_min_max_attributes.ent">
+<!-- -->
+<!ENTITY ui_component_attributes PUBLIC "ui_component_attributes" "entities/ui_component_attributes.ent">
+<!-- -->
+<!ENTITY ui_parameter_attributes PUBLIC "ui_parameter_attributes" "entities/ui_parameter_attributes.ent">
+<!-- -->
+<!ENTITY ui_for_attribute PUBLIC "ui_for_attribute" "entities/ui_for_attribute.ent">
+<!-- -->
+<!ENTITY ui_select_item_attributes PUBLIC "ui_select_item_attributes" "entities/ui_select_item_attributes.ent">
+<!-- -->
+<!ENTITY ui_select_items_attributes PUBLIC "ui_select_items_attributes" "entities/ui_select_items_attributes.ent">
+<!-- -->
+<!ENTITY html_anchor_attributes PUBLIC "html_anchor_attributes" "entities/html_anchor_attributes.ent">
+<!-- -->
+<!ENTITY html_button_attributes PUBLIC "html_button_attributes" "entities/html_button_attributes.ent">
+<!-- -->
+<!ENTITY html_event_handler_attributes PUBLIC "html_event_handler_attributes" "entities/html_events.ent">
+<!-- -->
+<!ENTITY html_form_attributes PUBLIC "html_form_attributes" "entities/html_form_attributes.ent">
+<!-- -->
+<!ENTITY spec_img_attributes PUBLIC "spec_img_attributes" "entities/spec_img_attributes.ent"> 
+<!-- -->
+<!ENTITY html_img_attributes PUBLIC "html_img_attributes" "entities/html_img_attributes.ent">
+<!-- -->
+<!ENTITY html_input_attributes PUBLIC "html_input_attributes" "entities/html_input_attributes.ent">
+<!-- -->
+<!ENTITY html_input_checkbox_attributes PUBLIC "html_input_checkbox_attributes" "entities/html_input_checkbox_attributes.ent">
+<!-- -->
+<!ENTITY html_input_radio_attributes PUBLIC "html_input_radio_attributes" "entities/html_input_radio_attributes.ent">
+<!-- -->
+<!ENTITY html_label_attributes PUBLIC "html_label_attributes" "entities/html_label_attributes.ent">
+<!-- -->
+<!ENTITY html_select_attributes PUBLIC "html_select_attributes" "entities/html_select_attributes.ent">
+<!-- -->
+<!ENTITY html_table_attributes PUBLIC "html_table_attributes" "entities/html_table_attributes.ent">
+<!-- -->
+<!ENTITY html_textarea_attributes PUBLIC "html_textarea_attributes" "entities/html_textarea_attributes.ent">
+<!-- -->
+<!ENTITY html_universal_attributes PUBLIC "html_universal_attributes" "entities/html_universal_attributes.ent">
+<!-- -->
+<!ENTITY html_style_attributes PUBLIC "html_style_attributes" "entities/html_style_attributes.ent">
+<!-- -->
+<!ENTITY html_control_attributes PUBLIC "html_control_attributes" "entities/html_control_attributes.ent">
+<!-- -->
+<!ENTITY html_control_events PUBLIC "html_control_events" "entities/html_control_events.ent">
+<!-- -->
+<!ENTITY html_events PUBLIC "html_events" "entities/html_events.ent">
+<!-- -->
+<!ENTITY html_input_events PUBLIC "html_input_events" "entities/html_input_events.ent">
+<!-- -->
+<!ENTITY ui_column_attributes PUBLIC "ui_column_attributes" "entities/ui_column_attributes.ent">
+<!-- -->
+<!ENTITY ui_command_attributes PUBLIC "ui_command_attributes" "entities/ui_command_attributes.ent">
+<!-- -->
+<!ENTITY ui_component_attributes PUBLIC "ui_component_attributes" "entities/ui_component_attributes.ent">
+<!-- -->
+<!ENTITY ui_data_attributes PUBLIC "ui_data_attributes" "entities/ui_data_attributes.ent">
+<!-- -->
+<!ENTITY ui_form_attributes PUBLIC "ui_form_attributes" "entities/ui_form_attributes.ent">
+<!-- -->
+<!ENTITY ui_graphic_attributes PUBLIC "ui_graphic_attributes" "entities/ui_graphic_attributes.ent">
+<!-- -->
+<!ENTITY ui_input_attributes PUBLIC "ui_input_attributes" "entities/ui_input_attributes.ent">
+<!-- -->
+<!ENTITY ui_message_attributes PUBLIC "ui_message_attributes" "entities/ui_message_attributes.ent">
+<!-- -->
+<!ENTITY ui_messages_attributes PUBLIC "ui_messages_attributes" "entities/ui_messages_attributes.ent">
+<!-- -->
+<!ENTITY ui_output_attributes PUBLIC "ui_output_attributes" "entities/ui_output_attributes.ent">
+<!-- -->
+<!ENTITY ui_panel_attributes PUBLIC "ui_panel_attributes" "entities/ui_panel_attributes.ent">
+<!-- -->
+<!ENTITY ui_parameter_attributes PUBLIC "ui_parameter_attributes" "entities/ui_parameter_attributes.ent">
+<!-- -->
+<!ENTITY ui_select_boolean_attributes PUBLIC "ui_select_boolean_attributes" "entities/ui_select_boolean_attributes.ent">
+<!-- -->
+<!ENTITY ui_select_many_attributes PUBLIC "ui_select_many_attributes" "entities/ui_select_many_attributes.ent">
+<!-- -->
+<!ENTITY ui_select_one_attributes PUBLIC "ui_select_one_attributes" "entities/ui_select_one_attributes.ent">
+<!-- -->
+<!ENTITY spec_img_attributes PUBLIC "spec_img_attributes" "entities/spec_img_attributes.ent">
+<!-- -->
+<!ENTITY spec_table_attributes PUBLIC "spec_table_attributes" "entities/spec_table_attributes.ent">
+<!-- -->
+<!ENTITY content_component_attributes PUBLIC "content_component_attributes" "entities/content_component_attributes.ent">
+<!-- -->
+<!ENTITY header_component_attributes PUBLIC "header_component_attributes" "entities/header_component_attributes.ent">
+<!--
+<!ENTITY standard_command_button_attributes PUBLIC "standard_command_button_attributes" "entities/standard_command_button_attributes.ent">
+<!ENTITY standard_command_link_attributes PUBLIC "standard_command_link_attributes" "entities/standard_command_link_attributes.ent">
+<!ENTITY standard_data_table_attributes PUBLIC "standard_data_table_attributes" "entities/standard_data_table_attributes.ent">
+<!ENTITY standard_input_text_attributes PUBLIC "standard_input_text_attributes" "entities/standard_input_text_attributes.ent">
+<!ENTITY standard_input_textarea_attributes PUBLIC "standard_input_textarea_attributes" "entities/standard_input_textarea_attributes.ent">
+<!ENTITY standard_message_attributes PUBLIC "standard_message_attributes" "entities/standard_message_attributes.ent">
+<!ENTITY standard_messages_attributes PUBLIC "standard_messages_attributes" "entities/standard_messages_attributes.ent">
+<!ENTITY standard_output_label_attributes PUBLIC "standard_output_label_attributes" "entities/standard_output_label_attributes.ent">
+<!ENTITY standard_output_text_attributes PUBLIC "standard_output_text_attributes" "entities/standard_output_text_attributes.ent">
+<!ENTITY standard_panel_group_attributes PUBLIC "standard_panel_group_attributes" "entities/standard_panel_group_attributes.ent">
+<!ENTITY standard_panel_grid_attributes PUBLIC "standard_panel_grid_attributes" "entities/standard_panel_grid_attributes.ent">
+<!ENTITY standard_select_boolean_checkbox_attributes PUBLIC "standard_select_boolean_checkbox_attributes" "entities/standard_select_boolean_checkbox_attributes.ent">
+<!ENTITY standard_select_many_checkbox_attributes PUBLIC "standard_select_many_checkbox_attributes" "entities/standard_select_many_checkbox_attributes.ent">
+<!ENTITY standard_select_many_listbox_attributes PUBLIC "standard_select_many_listbox_attributes" "entities/standard_select_many_listbox_attributes.ent">
+<!ENTITY standard_select_many_menu_attributes PUBLIC "standard_select_many_menu_attributes" "entities/standard_select_many_menu_attributes.ent">
+<!ENTITY standard_select_one_listbox_attributes PUBLIC "standard_select_one_listbox_attributes" "entities/standard_select_one_listbox_attributes.ent">
+<!ENTITY standard_select_one_menu_attributes PUBLIC "standard_select_one_menu_attributes" "entities/standard_select_one_menu_attributes.ent">
+<!ENTITY standard_select_one_radio_attributes PUBLIC "standard_select_one_radio_attributes" "entities/standard_select_one_radio_attributes.ent">
+-->
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,91 @@
+<properties>
+    <!--
+    <property >
+       <name>ajaxType</name>
+       <classname>java.lang.String</classname>
+       <description>If value equals "link" ( default ), builded JavaScript
+            code for "event" will submit as Action component. For
+            "input" value, and if parent component instance of UIInput will submit also value
+            for input field. For "validator" value force request processing to render after process validators phase.
+            For this, all conversions and validations method will performed, but new values not set to backed beans. 
+            </description>
+    </property>
+    -->
+    
+    <property >
+        <name>ajaxSingle</name>
+        <classname>boolean</classname>
+        <description>if "true", submits ONLY one field/link, instead of all form controls</description>
+    </property>
+    
+    <property >
+        <name>bypassUpdates</name>
+        <classname>boolean</classname>
+        <description>If "true", after process validations phase it skips updates of model beans on a force render response. It can be used for validating components input</description>
+    </property>
+    
+    <property >
+        <name>limitToList</name>
+        <classname>boolean</classname>
+        <description>If "true", updates on client side ONLY elements from this 'reRender' property. If "false" (default) updates all rendered by ajax region components</description>
+    </property>
+    
+    <property >
+        <name>reRender</name>
+        <classname>java.lang.Object</classname>
+        <description>Id['s] (in format of call  UIComponent.findComponent()) of components, rendered in case of AjaxRequest  caused by this component. Can be single id, comma-separated list of Id's, or EL Expression  with array or Collection</description>
+    </property>
+    
+    <property >
+        <name>status</name>
+        <classname>java.lang.String</classname>
+        <description>ID (in format of call UIComponent.findComponent()) of Request status component</description>
+    </property>
+    
+    <property >
+        <name>eventsQueue</name>
+        <classname>java.lang.String</classname>
+        <description>Name of requests queue to avoid send next request before complete other from same event. Can be used to reduce number of requests of frequently events (key press, mouse move etc.)</description>
+    </property>
+    
+    <property >
+        <name>requestDelay</name>
+        <classname>int</classname>
+        <description> Delay (in ms.) for send ajax request on JavaScript event. In conjunction with events queue can reduce number of requests on keyboard or mouse move events</description>
+    </property>
+    
+    <property >
+        <name>oncomplete</name>
+        <classname>java.lang.String</classname>
+        <description>JavaScript code for call after request completed on client side</description>
+    </property>
+    <property >
+        <name>focus</name>
+        <classname>java.lang.String</classname>
+        <description>id of element to set focus after request completed on client side</description>
+    </property>
+    <property >
+       <name>data</name>
+       <classname>java.lang.Object</classname>
+       <description>Serialized (on default with JSON) data passed on the client by a developer on AJAX request. It's accessible via "data.foo" syntax</description>
+    </property>
+	<property>
+			<name>ignoreDupResponses</name>
+			<classname>boolean</classname>
+			<description>
+				If "true", unfinished request will be aborted on new event
+			</description>
+	</property>
+	<property>
+			<name>timeout</name>
+			<classname>int</classname>
+			<description>Response waiting time on a particular request. If a response is not received during this time, the request is aborted</description>
+	</property>
+    <!--
+    <property >
+       <name></name>
+       <classname></classname>
+       <description></description>
+    </property>
+-->    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,25 @@
+<properties>
+    <property hidden="true">
+        <name>tagName</name>
+        <classname>java.lang.String</classname>
+        <description><![CDATA[A name of an html element encoded for this component.]]></description>
+        <defaultvalue><![CDATA["div"]]></defaultvalue> 
+    </property>
+    <property>
+        <name>sid</name>
+        <classname>java.lang.String</classname>
+        <description><![CDATA[EXACT value for an encoded html 'id' attribute, instead of JSF client id generation.]]></description>
+        <!-- 			<defaultvalue><![CDATA[]]></defaultvalue>  -->
+    </property>
+    <property hidden="true">
+        <name>effectDepth</name>
+        <classname>java.lang.String</classname>
+        <description>depth from 0 ( max ) to 1 ( none ) of visual effect  ( zoom, opacity etc )</description>
+    </property>
+    <property hidden="true">
+        <name>effectDuration</name>
+        <classname>java.lang.String</classname>
+        <description>time in seconds for duration of visual effect  ( zoom, opacity etc )</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,21 @@
+<properties>
+    <property>
+        <name>ajaxRendered</name>
+        <classname>boolean</classname>
+        <defaultvalue>true</defaultvalue>
+        <description>
+            Define, must be (or not) content of this component will be included in AJAX response created by parent AJAX Container, even if not forced by reRender list of ajax action.
+            ignored if component marked to output by Ajax action.
+        </description>
+    </property>
+    <property>
+        <name>keepTransient</name>
+        <classname>boolean</classname>
+        <description><![CDATA[
+				Flag for mark all child components to non-transient. If "true", all children components will be set to non-transient state and keep in saved components tree.
+				For output in self-renderer region all content (By default, all content in <f:verbatim> tags and non-jsf elements in facelets, marked as transient - since, self-rendered ajax regions don't plain output for ajax processing).
+			]]></description>
+        <defaultvalue>false</defaultvalue>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,26 @@
+<properties>
+    <property  elonly="true" el="true" attachedstate="true" >
+        <name>ajaxListener</name>
+        <defaultvalue>null</defaultvalue>
+        <classname>javax.faces.el.MethodBinding</classname>
+        <methodargs>org.ajax4jsf.framework.ajax.AjaxEvent.class</methodargs>
+        <description> MethodBinding representing an action listener method that will be notified when this component is activated by the ajax Request and handle it. The expression must evaluate to a public method that takes an AjaxEvent parameter, with a return type of void</description>
+    </property>
+    <property hidden="true">
+        <name>submitted</name>
+        <classname>boolean</classname>        
+    </property>    
+    <property >
+        <name>selfRendered</name>
+        <classname>boolean</classname>
+        <description>if "true", self-render subtree at InvokeApplication ( or Decode, if immediate property set to true )  phase </description>
+    </property>
+    
+    <property >
+        <name>immediate</name>
+        <classname>boolean</classname>
+        <description>Flag indicating that, if this component is activated by ajaxrequest, notifications should be delivered to interested listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke Application phase</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,25 @@
+<properties>
+    
+    <property>
+        <name>javascriptLocation</name><classname>java.lang.String</classname><description>
+            An alternate location to find javascript resources.  If no values are specified, javaScript will
+            be loaded from the resources directory using AddResource and ExtensionsFilter
+        </description>
+    </property>
+    
+    <property>
+        <name>imageLocation</name><classname>java.lang.String</classname><description>
+            An alternate location to find image resources.  If no values are specified, images will
+            be loaded from the resources directory using AddResource and ExtensionsFilter
+        </description>
+    </property>
+    
+    <property>
+        <name>styleLocation</name><classname>java.lang.String</classname><description>
+            An alternate location to find stylesheet resources.  If no values are specified, stylesheets will
+            be loaded from the resources directory using AddResource and ExtensionsFilter
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,14 @@
+<properties>
+    <property>
+        <name>contentStyle</name>
+        <classname>java.lang.String</classname>
+        <description>The component content style</description>
+        <defaultvalue><![CDATA[""]]></defaultvalue>
+    </property>
+    <property>
+        <name>contentClass</name>
+        <classname>java.lang.String</classname>
+        <description>The component content style class</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,22 @@
+<properties>
+    
+    
+    <property>
+        <name>displayValueOnly</name><classname>java.lang.String</classname><description>
+            If "true", renders only the value of the component, but no input widget.
+            Default is false
+        </description>
+    </property>
+    <property>
+        <name>displayValueOnlyStyle</name><classname>java.lang.String</classname><description>
+            Style used when displayValueOnly is true
+        </description>
+    </property>
+    <property>
+        <name>displayValueOnlyStyleClass</name><classname>java.lang.String</classname><description>
+            Style class used when displayValueOnly is true
+        </description>
+    </property>
+     
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1 @@
+<properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,36 @@
+<properties>
+    <property >
+        <name>dragValue</name>
+        <classname>java.lang.Object</classname>
+        <description><![CDATA[Data to be sent to the drop zone after a drop event]]></description>
+    </property>
+    <property>
+        <name>dragType</name>
+        <classname>java.lang.String</classname>
+        <description><![CDATA[Key of a drag object. It's used to define a necessity of processing the current dragged element on the drop zone side]]></description>
+    </property>
+    <property>
+        <name>dragIndicator</name>
+        <classname>java.lang.String</classname>
+        <description><![CDATA[Id of the dragIndicator component used as drag operation cursor]]></description>
+    </property>
+    <property >
+        <name>ondragstart</name>
+        <classname>java.lang.String</classname>
+        <description>A JavaScript event handler called before drag object</description>
+    </property>
+    <property>
+        <name>ondragend</name>
+        <classname>java.lang.String</classname>
+        <description>A JavaScript event handler called after a drag operation</description>
+    </property>
+ 		<property elonly="true" attachedstate="true">
+			<name>dragListener</name>
+			<classname>javax.faces.el.MethodBinding</classname>
+			<description>
+				MethodBinding representing an listener method that will be notified afrer drag operation.
+			</description>
+			<methodargs>org.ajax4jsf.dnd.event.DragEvent.class</methodargs>
+		</property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,48 @@
+<properties>
+    <property >
+        <name>dropValue</name>
+        <classname>java.lang.Object</classname>
+        <description><![CDATA[Data to be processed after a drop event]]></description>
+    </property>
+    <property>
+        <name>typeMapping</name>
+        <classname>java.lang.Object</classname>
+        <description><![CDATA[Map between a draggable type and an indicator name on zone. it's defined with the pair (drag type:indicator name))]]></description>
+        <!-- 			<defaultvalue><![CDATA[]]></defaultvalue>  -->
+    </property>
+    <property>
+        <name>acceptedTypes</name>
+        <classname>java.lang.Object</classname>
+        <description><![CDATA[List of drag types to be processed by the current drop zone]]></description>
+        <!-- 			<defaultvalue><![CDATA[]]></defaultvalue>  -->
+    </property>
+    <property >
+        <name>ondragenter</name>
+        <classname>java.lang.String</classname>
+        <description>A JavaScript event handler called on enter draggable object to zone</description>
+    </property>
+    <property>
+        <name>ondragexit</name>
+        <classname>java.lang.String</classname>
+        <description>A JavaScript event handler called after a drag object leaves zone</description>
+    </property>
+    <property>
+        <name>ondrop</name>
+        <classname>java.lang.String</classname>
+        <description>A JavaScript event handler called after a drag object is dropped to zone</description>
+    </property>    
+    <property>
+        <name>ondropend</name>
+        <classname>java.lang.String</classname>
+        <description>A JavaScript handler for event fired on a drop even the drop for a given type is not available</description>
+    </property>    
+		<property>
+			<name>dropListener</name>
+			<classname>javax.faces.el.MethodBinding</classname>
+			<description><![CDATA[
+				MethodBinding representing an action listener method that will be notified afrer drop operation
+				]]>
+			</description>
+			<methodargs>org.ajax4jsf.dnd.event.DropEvent.class</methodargs>
+		</property>
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,14 @@
+<properties>
+    
+    <property>
+        <name>onSuccess</name><classname>java.lang.String</classname><description>A JavaScript method to call on successful ajax update</description>
+    </property>
+    <property>
+        <name>onFailure</name><classname>java.lang.String</classname><description>A JavaScript method to call on failed ajax update</description>
+    </property>
+    <property>
+        <name>onStart</name><classname>java.lang.String</classname><description>A JavaScript method to call on start of ajax update</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,12 @@
+<properties>    
+    <property>
+        <name>forceId</name><classname>java.lang.String</classname><description>If "true", this component will force the use of the specified id when rendering</description>
+    </property>
+    <property>
+        <name>forceIdIndex</name><classname>java.lang.String</classname><description>
+            If "false", this component isn't append a '[n]' suffix (where 'n' is the row index) to components 
+            that are contained within a "list."  This value is true by default and the value is ignored if 
+            the value of forceId is false (or not specified.)
+        </description>
+    </property>     
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,134 @@
+<properties>
+        <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>action</name><classname>java.lang.String</classname><description>MethodBinding pointing at an application action to be invoked, if this UIComponent is activated manually, during the Apply Request Values or Invoke Application phase of a request processing lifecycle, depending on a value of an immediate property</description>
+    </property>
+    <property>
+        <name>actionListener</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method accepting ActionEvent and returning type void</description>
+    </property>
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description>"True" means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase</description>
+    </property>
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>charset</name><classname>java.lang.String</classname><description>The character encoding of the resource designated by this hyperlink</description>
+    </property>
+    <property>
+        <name>coords</name><classname>java.lang.String</classname><description>This attribute specifies the position and shape on the screen. The number and order of values depends on the shape being defined. Possible combinations:
+            
+            * rect: left-x, top-y, right-x, bottom-y.
+            * circle: center-x, center-y, radius. Note. When the radius value is percentage value, user agents should calculate the final radius value based on the associated object width and height. The radius should be the smaller value of the two.
+            * poly: x1, y1, x2, y2, ..., xN, yN. The first x and y coordinate pair and the last should be the same to close the polygon. When these coordinate values are not the same, user agents should infer an additional coordinate pair to close the polygon.
+            
+            Coordinates are relative to the top, left corner of the object. All values are lengths. All values are separated by commas.
+        </description>
+    </property>
+    
+    <property>
+        <name>hreflang</name><classname>java.lang.String</classname><description>Base language of a resource specified with the href attribute; hreflang may only be used with href</description>
+    </property>
+    
+    <property>
+        <name>rel</name><classname>java.lang.String</classname><description>The relationship from the current document to an anchor specified by this hyperlink. The value of this attribute is a space-separated list of link types</description>
+    </property>
+    <property>
+        <name>rev</name><classname>java.lang.String</classname><description>A reverse link from an anchor specified by this hyperlink to the current document. The value of this attribute is a space-separated list of link types</description>
+    </property>
+    <property>
+        <name>shape</name><classname>java.lang.String</classname><description>default|rect|circle|poly [CI]
+            This attribute specifies the shape of a region. Possible values:
+            
+            * default: Specifies the entire region.
+            * rect: Define a rectangular region.
+            * circle: Define a circular region.
+            * poly: Define a polygonal region.
+            
+        </description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies a position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>type</name><classname>java.lang.String</classname><description>	 The content type of the resource designated by this hyperlink</description>
+    </property>
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    <property>
+        <name>target</name><classname>java.lang.String</classname><description>This attribute specifies the name of a frame where a document is to be opened.
+            
+            By assigning a name to a frame via the name attribute, authors can refer to it as the "target" of links defined by other elements 
+        </description>
+    </property>  
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,131 @@
+<properties>
+    
+    <property>
+        <name>preserveDataModel</name><classname>java.lang.String</classname><description>
+            Indicates whether a state of the whole DataModel should be saved and
+            restored.
+            Default: false
+        </description>
+    </property>
+    <property>
+        <name>forceIdIndexFormula</name><classname>java.lang.String</classname><description>
+            A formula that overrides the defaut row index in the construction of table
+            body components.
+            Example : #{myRowVar.key}
+            Warning, the EL should evaluate to a unique value for each row!
+        </description>
+    </property>
+    <property>
+        <name>sortColumn</name><classname>java.lang.String</classname><description>
+            Value reference to a model property that gives the current sort column name
+        </description>
+    </property>
+    <property>
+        <name>sortAscending</name><classname>java.lang.String</classname><description>
+            Value reference to a model property that gives the current sort direction
+        </description>
+    </property>
+    <property>
+        <name>preserveSort</name><classname>java.lang.String</classname><description>
+            Indicates whether the state of the sortColumn and sortAscending attribute
+            should be saved and restored and written back to a model during an
+            update model phase.
+            Default: true
+        </description>
+    </property>
+    <property>
+        <name>renderedIfEmpty</name><classname>java.lang.String</classname><description>
+            Indicates whether this table should be rendered if the underlying DataModel is
+            empty.
+            You could as well use rendered="#{not empty bean.list}", but this one causes
+            the getList method of your model bean beeing called up to five times per
+            request, which is not optimal when the list is backed by a DB table.
+            Using renderedIfEmpty="false" solves this problem, because the MyFaces
+            extended HtmlDataTable automatically caches the DataModel and calles the
+            model getter only once per request.
+            Default: true
+        </description>
+    </property>
+    <property>
+        <name>rowIndexVar</name><classname>java.lang.String</classname><description>
+            A parameter name, under which the current rowIndex is set in request scope
+            similar to the var parameter
+        </description>
+    </property>
+    <property>
+        <name>rowCountVar</name><classname>java.lang.String</classname><description>
+            A parameter name, under which the rowCount is set in request scope
+            similar to the var parameter
+        </description>
+    </property>
+    <property>
+        <name>previousRowDataVar</name><classname>java.lang.String</classname><description>
+            A parameter name, under which the previous RowData Object is set in request scope
+            similar to the rowIndexVar and rowCountVar parameters.
+            Mind that the value of this request scope attribute is null in the first row
+            or when isRowAvailable returns false for the previous row
+        </description>
+    </property>
+    <property>
+        <name>rowOnClick</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onclick event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnDblClick</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript ondblclick event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnMouseDown</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onmpusedown event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnMouseUp</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onmouseup event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnMouseOver</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onmouseover event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnMouseMove</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onmousemove event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnMouseOut</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onmouseout event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnKeyPress</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onkeypress event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnKeyDown</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onkeydown event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowOnKeyUp</name><classname>java.lang.String</classname><description>
+            Defines a JavaScript onkeyup event handler for each table row
+        </description>
+    </property>
+    <property>
+        <name>rowId</name><classname>java.lang.String</classname><description>
+            The id to use for &lt;tr&gt; elements that are generated by a table
+        </description>
+    </property>
+    <property>
+        <name>rowStyleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute for the row tr tag</description>
+    </property>
+    <property>
+        <name>rowStyle</name><classname>java.lang.String</classname><description>Corresponds to the HTML style attribute for the row tr tag</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,14 @@
+<properties>
+    <property>
+        <name>headerStyle</name>
+        <classname>java.lang.String</classname>
+        <description>The component header style</description>
+        <defaultvalue><![CDATA[""]]></defaultvalue>
+    </property>
+    <property>
+        <name>headerClass</name>
+        <classname>java.lang.String</classname>
+        <description>The component header style class</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,87 @@
+<properties>
+    <property>
+        <name>accesskey</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note: Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>charset</name>
+        <classname>java.lang.String</classname>
+        <description> The character encoding of a resource designated by this hyperlink</description>
+    </property>
+    <property>
+        <name>coords</name>
+        <classname>java.lang.String</classname>
+        <description> This attribute specifies the position and shape on the screen. The number and order of values depends on the shape being defined. Possible combinations:
+            
+            * rect: left-x, top-y, right-x, bottom-y.
+            * circle: center-x, center-y, radius. Note. When the radius value is percentage value, user agents should calculate the final radius value based on the associated object's width and height. The radius should be the smaller value of the two.
+            * poly: x1, y1, x2, y2, ..., xN, yN. The first x and y coordinate pair and the last should be the same to close the polygon. When these coordinate values are not the same, user agents should infer an additional coordinate pair to close the polygon.
+            
+            Coordinates are relative to the top, left corner of the object. All values are lengths. All values are separated by commas
+        </description>
+    </property>
+    
+    <property>
+        <name>hreflang</name>
+        <classname>java.lang.String</classname>
+        <description>Base language of a resource specified with the href attribute; hreflang may only be used with href</description>
+    </property>
+    
+    <property>
+        <name>rel</name>
+        <classname>java.lang.String</classname>
+        <description>The relationship from the current document to the anchor specified by this hyperlink. The value of this attribute is a space-separated list of link types</description>
+    </property>
+    <property>
+        <name>rev</name>
+        <classname>java.lang.String</classname>
+        <description>A reverse link from the anchor specified by this hyperlink to the current document. The value of this attribute is a space-separated list of link types</description>
+    </property>
+    <property>
+        <name>shape</name>
+        <classname>java.lang.String</classname>
+        <description>default|rect|circle|poly [CI]
+            This attribute specifies the shape of a region. Possible values:
+            
+            * default: Specifies the entire region.
+            * rect: Define a rectangular region.
+            * circle: Define a circular region.
+            * poly: Define a polygonal region.
+            
+        </description>
+    </property>
+    <property>
+        <name>tabindex</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>type</name>
+        <classname>java.lang.String</classname>
+        <description>The content type of the resource designated by this hyperlink</description>
+    </property>
+    
+    <property>
+        <name>onblur</name>
+        <classname>java.lang.String</classname>
+        <description>JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onfocus</name>
+        <classname>java.lang.String</classname>
+        <description>JavaScript code. The onfocus event occurs when an element gets focus</description>
+    </property>
+    
+    <property>
+        <name>target</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the name of a frame where a document is to be opened.
+            
+            By assigning a name to a frame via the name attribute, authors can refer to it as the "target" of links defined by other elements 
+        </description>
+    </property>
+    
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,8 @@
+<properties>
+    &html_control_attributes;
+    <property>
+        <name>type</name>
+        <classname>java.lang.String</classname>
+        <description>submit|reset|image|button This attribute specifies a type of control to create. The default value for this attribute is "submit"</description>
+    </property>    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,28 @@
+<properties>
+    <property>
+        <name>accesskey</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note: Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>alt</name>
+        <classname>java.lang.String</classname>
+        <description>For a user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description>
+    </property>
+    <property>
+        <name>disabled</name>
+        <classname>boolean</classname>
+        <description>When set for a form control, this boolean attribute disables the control for user input</description>
+    </property>
+    
+    <property>
+        <name>size</name>
+        <classname>int</classname>
+        <description>This attribute tells the user agent the initial width of the control. The width is given in pixels except when type attribute has the value "text" or "password". In that case, its value refers to the (integer) number of characters</description>
+    </property>
+    <property>
+        <name>tabindex</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,20 @@
+<properties>
+    <!-- HTML 4.0 - events specific for controls -->
+    <property>
+        <name>onblur</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: script expression; the element lost the focus</description>
+    </property>
+    <property>
+        <name>onfocus</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: script expression; the element got the focus</description>
+    </property>
+    <property>
+        <name>onchange</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: script expression; the element value was changed</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,54 @@
+<properties>
+    <!-- HTML 4.0 events -->
+    <property>
+        <name>onclick</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a pointer button is clicked</description>
+    </property>
+    <property>
+        <name>ondblclick</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a pointer button is double-clicked</description>
+    </property>
+    <property>
+        <name>onkeydown</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a key is pressed down</description>
+    </property>
+    <property>
+        <name>onkeypress</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a key is pressed and released</description>
+    </property>
+    <property>
+        <name>onkeyup</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a key is released</description>
+    </property>
+    <property>
+        <name>onmousedown</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: script expression; a pointer button is pressed down</description>
+    </property>
+    <property>
+        <name>onmousemove</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a pointer is moved within</description>
+    </property>
+    <property>
+        <name>onmouseout</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a pointer is moved away</description>
+    </property>
+    <property>
+        <name>onmouseover</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: a script expression; a pointer is moved onto</description>
+    </property>
+    <property>
+        <name>onmouseup</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: script expression; a pointer button is released</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,40 @@
+<properties>
+    <property>
+        <name>accept</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies a comma-separated list of content types that a server processing this form will handle correctly. User agents may use this information to filter out non-conforming files when prompting a user to select files to be sent to the server (cf. the INPUT element when type="file")</description>
+    </property>
+    <property>
+        <name>acceptCharset</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the list of character encodings for input data that is accepted by the server processing this form. The value is a space- and/or comma-delimited list of charset values. The client must interpret this list as an exclusive-or list, i.e., the server is able to accept any single character encoding per entity received.
+            
+            The default value for this attribute is the reserved string "UNKNOWN". User agents may interpret this value as the character encoding that was used to transmit the document containing this FORM element
+        </description>
+    </property>
+    <property>
+        <name>enctype</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the content type used to submit the form to the server (when the value of method is "post"). The default value for this attribute is "application/x-www-form-urlencoded". The value "multipart/form-data" should be used in combination with the INPUT element, type="file"</description>
+    </property>
+    <property>
+        <name>onreset</name>
+        <classname>java.lang.String</classname>
+        <description>The onreset event occurs when a form is reset. It only applies to the FORM element</description>
+    </property>
+    <property>
+        <name>onsubmit</name>
+        <classname>java.lang.String</classname>
+        <description>The onsubmit event occurs when a form is submitted. It only applies to the FORM element</description>
+    </property>
+    <property>
+        <name>target</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the name of a frame where a document is to be opened.
+            
+            By assigning a name to a frame via the name attribute, authors can refer to it as the "target" of links defined by other elements 
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,31 @@
+<properties>
+    <property>
+        <name>align</name>
+        <classname>java.lang.String</classname>
+        <description>bottom|middle|top|left|right
+            Deprecated. This attribute specifies the position of an IMG, OBJECT, or APPLET with respect to its context.
+            
+            The following values for align concern the object's position with respect to surrounding text:
+            
+            * bottom: means that the bottom of the object should be vertically aligned with the current baseline. This is the default value.
+            * middle: means that the center of the object should be vertically aligned with the current baseline.
+            * top: means that the top of the object should be vertically aligned with the top of the current text line
+        </description>
+    </property>
+    <property>
+        <name>border</name>
+        <classname>java.lang.String</classname>
+        <description>Deprecated. This attribute specifies the width of an IMG or OBJECT border, in pixels. The default value for this attribute depends on the user agent</description>
+    </property>
+    <property>
+        <name>hspace</name>
+        <classname>java.lang.String</classname>
+        <description>Deprecated. This attribute specifies the amount of white space to be inserted to the left and right of an IMG, APPLET, or OBJECT. The default value is not specified, but is generally a small, non-zero length</description>
+    </property>
+    <property>
+        <name>vspace</name>
+        <classname>java.lang.String</classname>
+        <description>Deprecated. This attribute specifies the amount of white space to be inserted above and below an IMG, APPLET, or OBJECT. The default value is not specified, but is generally a small, non-zero length</description>
+    </property>    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,25 @@
+<properties>
+    &html_control_attributes;
+    
+    
+    <property>
+        <name>align</name>
+        <classname>java.lang.String</classname>
+        <description>left|center|right|justify [CI]
+            Deprecated. This attribute specifies the horizontal alignment of its element with respect to the surrounding context. Possible values:
+            
+            * left: text lines are rendered flush left.
+            * center: text lines are centered.
+            * right: text lines are rendered flush right.
+            * justify: text lines are justified to both margins.
+            
+            The default depends on the base text direction. For left to right text, the default is align=left, while for right to left text, the default is align=right
+        </description>
+    </property>
+    <property>
+        <name>maxlength</name>
+        <classname>int</classname>
+        <description>When the type attribute has the value "text" or "password", this attribute specifies the maximum number of characters the user may enter. This number may exceed the specified size, in which case the user agent should offer a scrolling mechanism. The default value for this attribute is an unlimited number</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,45 @@
+<properties>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an access key</description>
+    </property>
+    <property>
+        <name>alt</name><classname>java.lang.String</classname>	<description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> 
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> 
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,8 @@
+<properties>
+    &html_control_events;
+    <property>
+        <name>onselect</name>
+        <classname>java.lang.String</classname>
+        <description>HTML: script expression; The onselect event occurs when a user selects some text in a text field. This attribute may be used with the INPUT and TEXTAREA elements</description>
+    </property>
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,9 @@
+<properties>
+    
+    
+    <property>
+        <name>helpText</name><classname>java.lang.String</classname><description>Makes tiptext appear over an item when the mouse is hovered over it</description>
+    </property>
+    <property>
+        <name>selectText</name><classname>java.lang.String</classname><description>Selects text in the field</description>
+    </properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,45 @@
+<properties>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,16 @@
+<properties>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,38 @@
+<properties>
+    
+    
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,14 @@
+<properties>
+    <property>
+        <name>style</name>
+        <classname>java.lang.String</classname>
+        <description>CSS style(s) is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>styleClass</name>
+        <classname>java.lang.String</classname>
+        <description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,83 @@
+<properties>
+    <property>
+        <name>align</name>
+        <classname>java.lang.String</classname>
+        <description>left|center|right [CI]
+            Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values:
+            
+            * left: The table is to the left of the document.
+            * center: The table is to the center of the document.
+            * right: The table is to the right of the document
+            
+        </description>
+    </property>
+    <property>
+        <name>border</name>
+        <classname>java.lang.String</classname>
+        <description>This attributes specifies the width (in pixels only) of the frame around a table</description>
+    </property>
+    <property>
+        <name>bgcolor</name>
+        <classname>java.lang.String</classname>
+        <description>Deprecated. This attribute sets the background color for the document body or table cells.
+            
+            This attribute sets the background color of the canvas for the document body (the BODY element) or for tables (the TABLE, TR, TH, and TD elements). Additional attributes for specifying text color can be used with the BODY element.
+            
+            This attribute has been deprecated in favor of style sheets for specifying background color information
+        </description>
+    </property>
+    <property>
+        <name>cellpadding</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is percentage length, the top and bottom margins should be equally separated from the content based on percentage of the available vertical space, and the left and right margins should be equally separated from the content based on percentage of the available horizontal space
+            
+        </description>
+    </property>
+    <property>
+        <name>cellspacing</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells</description>
+    </property>
+    <property>
+        <name>frame</name>
+        <classname>java.lang.String</classname>
+        <description>void|above|below|hsides|lhs|rhs|vsides|box|border [CI]
+            This attribute specifies which sides of the frame surrounding a table will be visible. Possible values:
+            
+            * void: No sides. This is the default value.
+            * above: The top side only.
+            * below: The bottom side only.
+            * hsides: The top and bottom sides only.
+            * vsides: The right and left sides only.
+            * lhs: The left-hand side only.
+            * rhs: The right-hand side only.
+            * box: All four sides.
+            * border: All four sides
+            
+        </description>
+    </property>
+    <property>
+        <name>rules</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. Possible values:
+            
+            * none: No rules. This is the default value.
+            * groups: Rules will appear between row groups (see THEAD, TFOOT, and TBODY) and column groups (see COLGROUP and COL) only.
+            * rows: Rules will appear between rows only.
+            * cols: Rules will appear between columns only.
+            * all: Rules will appear between all rows and columns
+        </description>
+    </property>
+    <property>
+        <name>summary</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille</description>
+    </property>
+    <property>
+        <name>width</name>
+        <classname>java.lang.String</classname>
+        <description>This attribute specifies the desired width of the entire table and is intended for visual user agents. When the value is percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,48 @@
+<properties>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>cols</name><classname>java.lang.String</classname><description>Number of columns</description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    <property>
+        <name>rows</name><classname>java.lang.String</classname><description>Number of rows</description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,23 @@
+<properties>
+    &html_style_attributes;
+    <property>
+        <name>dir</name>
+        <classname>java.lang.String</classname>
+        <description>
+			Direction indication for text that does not inherit
+			directionality. Valid values are "LTR" (left-to-right)
+			and "RTL" (right-to-left)
+		</description>
+    </property>
+    <property>
+        <name>lang</name>
+        <classname>java.lang.String</classname>
+        <description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>title</name>
+        <classname>java.lang.String</classname>
+        <description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,39 @@
+<properties>
+    <property>
+        <name>alt</name>
+        <classname>java.lang.String</classname>
+        <description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description>
+    </property>
+    <property>
+        <name>height</name>
+        <classname>java.lang.String</classname>
+        <description>    Image and object height override.
+            
+            When specified, the width and height attributes tell user agents to override the natural image or object size in favor of these values
+        </description>
+    </property>
+    <property>
+        <name>ismap</name>
+        <classname>boolean</classname>
+        <description>Flag indicating that this image is to be used as a server side image map. Such an image must be enclosed within a hyperlink ("a")</description>
+    </property>
+    <property>
+        <name>longdesc</name>
+        <classname>java.lang.String</classname>
+        <description>URI to a long description of the image represented by this element</description>
+    </property>
+    
+    
+    <property>
+        <name>usemap</name>
+        <classname>java.lang.String</classname>
+        <description> The name of a client side image map (an HTML "map" element) for which this element provides the image</description>
+    </property>
+    <property>
+        <name>width</name>
+        <classname>java.lang.String</classname>
+        <description>Image and object width override. When specified, the width and height attributes tell user agents to override the natural image or object size in favor of these values</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,24 @@
+<properties>
+    
+    <property>
+        <name>columnClasses</name>
+        <classname>java.lang.String</classname>
+        <description> Comma-delimited list of CSS style classes that are be applied to the columns of this table. A space separated list of classes may also be specified for any individual column. If the number of elements in this list is less than the number of columns specified in the "columns" attribute, no "class" attribute is output for each column greater than the number of elements in the list. If the number of elements in the list is greater than the number of columns specified in the "columns" attribute, the elements at the position in the list after the value of the "columns" attribute are ignored</description>
+    </property>
+    <property>
+        <name>footerClass</name>
+        <classname>java.lang.String</classname>
+        <description>Space-separated list of CSS style class(es) that are be applied to any footer generated for this table</description>
+    </property>
+    <property>
+        <name>headerClass</name>
+        <classname>java.lang.String</classname>
+        <description> Space-separated list of CSS style class(es) that are be applied to any header generated for this table</description>
+    </property>
+    <property>
+        <name>rowClasses</name>
+        <classname>java.lang.String</classname>
+        <description> A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. The styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,120 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property  attachedstate="true">
+        <name>action</name><classname>java.lang.String</classname><description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property</description>
+    </property>
+    <property  attachedstate="true">
+        <name>actionListener</name><classname>java.lang.String</classname><description>MethodBinding pointing at method accepting an ActionEvent with return type void</description>
+    </property>
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase</description>
+    </property>
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description>Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The 
+            
+            language of the alternate text is specified by the lang attribute.
+        </description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>An element is selected</description>
+    </property>
+    <property>
+        <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>type</name><classname>java.lang.String</classname><description>	 The content type of the resource designated by this component</description>
+    </property>
+    
+    
+    <property>
+        <name>image</name><classname>java.lang.String</classname>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,120 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean/description>
+    </property>
+    
+    <property  attachedstate="true">
+        <name>action</name><classname>java.lang.String</classname><description>MethodBinding pointing at an application action to be invoked, if this UIComponent is activated manually, during the Apply Request Values or Invoke Application phase of a request processing lifecycle, depending on a value of an immediate property</description>
+    </property>
+    <property  attachedstate="true">
+        <name>actionListener</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method accepting ActionEvent and returning type void</description>
+    </property>
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase</description>
+    </property>
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description>Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>charset</name><classname>java.lang.String</classname><description>The character encoding of the resource designated by this hyperlink</description>
+    </property>
+    <property>
+        <name>coords</name><classname>java.lang.String</classname><description>This attribute specifies the position and shape on the screen. The number and order of values depends on the shape being defined. Possible combinations:
+            
+            <property>
+                <name>hreflang</name><classname>java.lang.String</classname><description>Base language of a resource specified with the href attribute; hreflang may only be used with href</description>
+            </property>
+            
+            <property>
+                <name>rel</name><classname>java.lang.String</classname><description>The relationship from the current document to the anchor specified by this hyperlink. The value of this attribute is a space-separated list of link types</description>
+            </property>
+            <property>
+                <name>rev</name><classname>java.lang.String</classname><description>A reverse link from the anchor specified by this hyperlink to the current document. The value of this attribute is a space-separated list of link types</description>
+            </property>
+            <property>
+                <name>shape</name><classname>java.lang.String</classname><description>default|rect|circle|poly [CI]
+                    <property>
+                        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+                    </property>
+                    <property>
+                        <name>type</name><classname>java.lang.String</classname><description>	 The content type of the resource designated by this hyperlink</description>
+                    </property>
+                    
+                    <property>
+                        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+                    </property>
+                    
+                    <property>
+                        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+                    </property>
+                    <property>
+                        <name>target</name><classname>java.lang.String</classname><description>    This attribute specifies the name of a frame where a document is to be opened.
+                            
+                            
+                            
+                        </properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,181 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s)is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>align</name><classname>java.lang.String</classname><description>left|center|right [CI]
+            Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values:
+            
+            * left: The table is to the left of the document.
+            * center: The table is to the center of the document.
+            * right: The table is to the right of the document
+            
+        </description>
+    </property>
+    <property>
+        <name>border</name><classname>java.lang.String</classname><description>This attributes specifies the width (in pixels only) of the frame around a table </description>
+    </property>
+    <property>
+        <name>bgcolor</name><classname>java.lang.String</classname><description>Deprecated. This attribute sets the background color for the document body or table cells.
+            
+            This attribute sets the background color of the canvas for the document body (the BODY element) or for tables (the TABLE, TR, TH, and TD elements). Additional attributes for specifying text color can be used with the BODY element.
+            
+            This attribute has been deprecated in favor of style sheets for specifying background color information
+        </description>
+    </property>
+    <property>
+        <name>cellpadding</name><classname>java.lang.String</classname><description>    This
+         attribute specifies the amount of space between the border of the cell and its contents.
+          If the value of this attribute is a pixel length, all four margins should be this
+           distance from the contents. If the value of the attribute is percentage length, the
+            top and bottom margins should be equally separated from the content based on percentage of the available vertical space, and the left and right margins should be
+             equally separated from the content based on percentage of the available horizontal space
+            
+        </description>
+    </property>
+    <property>
+        <name>cellspacing</name><classname>java.lang.String</classname><description>This attribute specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells</description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>frame</name><classname>java.lang.String</classname><description>void|above|below|hsides|lhs|rhs|vsides|box|border [CI]
+            This attribute specifies which sides of the frame surrounding a table will be visible. Possible values:
+            
+            * void: No sides. This is the default value.
+            * above: The top side only.
+            * below: The bottom side only.
+            * hsides: The top and bottom sides only.
+            * vsides: The right and left sides only.
+            * lhs: The left-hand side only.
+            * rhs: The right-hand side only.
+            * box: All four sides.
+            * border: All four sides
+            
+        </description>
+    </property>
+    <property>
+        <name>rules</name><classname>java.lang.String</classname><description>This attribute specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. Possible values:
+            
+            * none: No rules. This is the default value.
+            * groups: Rules will appear between row groups (see THEAD, TFOOT, and TBODY) and column groups (see COLGROUP and COL) only.
+            * rows: Rules will appear between rows only.
+            * cols: Rules will appear between columns only.
+            * all: Rules will appear between all rows and columns
+        </description>
+    </property>
+    <property>
+        <name>summary</name><classname>java.lang.String</classname><description>This attribute provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille</description>
+    </property>
+    <property>
+        <name>width</name><classname>java.lang.String</classname><description>This attribute specifies the desired width of the entire table and is intended for visual user agents. When the value is percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent</description>
+    </property>
+    
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Supported types see JSF Spec 4.1.3</description>
+    </property>
+    <property>
+        <name>var</name><classname>java.lang.String</classname><description>
+            The request-scope attribute under which the data object for the
+            current row will be exposed when iterating
+        </description>
+    </property>
+    <property>
+        <name>rows</name><classname>java.lang.String</classname><description>
+            The number of rows to be displayed, or zero for all remaining
+            rows in the table.
+        </description>
+    </property>
+    <property>
+        <name>first</name><classname>java.lang.String</classname><description>
+            The zero-relative row number of the first row to be displayed
+        </description>
+    </property>
+    
+    <property>
+        <name>columnClasses</name><classname>java.lang.String</classname><description>Comma-separated list of CSS classes for columns</description>
+    </property>
+    <property>
+        <name>footerClass</name><classname>java.lang.String</classname><description>CSS class for the table footer</description>
+    </property>
+    <property>
+        <name>headerClass</name><classname>java.lang.String</classname><description>CSS class for the table header</description>
+    </property>
+    <property>
+        <name>rowClasses</name><classname>java.lang.String</classname><description>A comma-delimited list of CSS style classes that is applied to popup table rows</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,138 @@
+<properties>
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>align</name><classname>java.lang.String</classname><description>left|center|right [CI]
+            Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values:
+            
+            * left: The table is to the left of the document.
+            * center: The table is to the center of the document.
+            * right: The table is to the right of the document
+            
+        </description>
+    </property>
+    <property>
+        <name>alt</name><classname>java.lang.String</classname>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The 
+        
+        language of the alternate text is specified by the lang attribute.
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>maxlength</name><classname>java.lang.String</classname><description>Maximum number of characters for text fields</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled.
+        </description>
+    </property>
+    <property>
+        <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,132 @@
+<properties>
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>cols</name><classname>java.lang.String</classname><description>Number of columns</description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname>Flag indicating that this component will prohibit
+        changes by the user.  The element may receive focus
+        unless it has also been disabled.
+        <property>
+            <name>rows</name><classname>java.lang.String</classname><description>Number of rows</description>
+        </property>
+        <property>
+            <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+        </property>
+        
+        
+        <property>
+            <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+        </property>
+        <property>
+            <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+        </property>
+        <property>
+            <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description>
+        </property>
+        <property>
+            <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+        </property>
+        <property>
+            <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+        </property>
+        
+        
+        <property>
+            <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+        </property>
+        <property>
+            <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+        </property>
+        <property>
+            <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+        </property>
+        <property>
+            <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+        </property>
+        <property>
+            <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+        </property>
+        <property>
+            <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+        </property>
+        <property>
+            <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+        </property>
+        <property>
+            <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+        </property>
+        <property>
+            <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+        </property>
+        <property>
+            <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+        </property>
+        
+        
+        
+        
+    </properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,113 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>for</name><classname>java.lang.String</classname><description>The client identifier of the component for which this component represents associated message(s)</description>
+    </property>
+    <property>
+        <name>showSummary</name><classname>java.lang.String</classname><description>Indicates whether the summary of the associated message(s) should be displayed.
+            Default is: true
+        </description>
+    </property>
+    <property>
+        <name>showDetail</name><classname>java.lang.String</classname><description>Indicates whether the detail of the associated message(s) should be displayed.
+            Default is: false
+        </description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>infoClass</name><classname>java.lang.String</classname><description>CSS class to be used for messages with severity "INFO"</description>
+    </property>
+    <property>
+        <name>infoStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "INFO"</description>
+    </property>
+    <property>
+        <name>warnClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "WARN"</description>
+    </property>
+    <property>
+        <name>warnStyle</name><classname>java.lang.String</classname><description>CSS style is to be used for messages with severity "WARN"</description>
+    </property>
+    <property>
+        <name>errorClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "ERROR"</description>
+    </property>
+    <property>
+        <name>errorStyle</name><classname>java.lang.String</classname><description>CSS style is to be used for messages with severity "ERROR"</description>
+    </property>
+    <property>
+        <name>fatalClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "FATAL"</description>
+    </property>
+    <property>
+        <name>fatalStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "FATAL"</description>
+    </property>
+    <property>
+        <name>tooltip</name><classname>java.lang.String</classname><description>
+            If "true", the message summary will be rendered as a tooltip (i.e. HTML title attribute)
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,117 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>showSummary</name><classname>java.lang.String</classname><description>Indicates whether the summary of the message(s) should be displayed.
+            Default is: true
+        </description>
+    </property>
+    <property>
+        <name>showDetail</name><classname>java.lang.String</classname><description>Indicates whether the detail of the message(s) should be displayed.
+            Default is: false
+        </description>
+    </property>
+    <property>
+        <name>globalOnly</name><classname>java.lang.String</classname><description>Indicates whether only global messages (that is, messages with no associated client identifier) should be rendered.
+            Default is: false
+        </description>
+    </property>
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendere</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>infoClass</name><classname>java.lang.String</classname><description>CSS class to be used for messages with severity "INFO"</description>
+    </property>
+    <property>
+        <name>infoStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "INFO"</description>
+    </property>
+    <property>
+        <name>warnClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "WARN"</description>
+    </property>
+    <property>
+        <name>warnStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "WARN"</description>
+    </property>
+    <property>
+        <name>errorClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "ERROR"</description>
+    </property>
+    <property>
+        <name>errorStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "ERROR"</description>
+    </property>
+    <property>
+        <name>fatalClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "FATAL"</description>
+    </property>
+    <property>
+        <name>fatalStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "FATAL"</description>
+    </property>
+    <property>
+        <name>layout</name><classname>java.lang.String</classname><description>The layout: "table" or "list". Default: list</description>
+    </property>
+    <property>
+        <name>tooltip</name><classname>java.lang.String</classname><description>
+            If "true", the message summary will be rendered as a tooltip (i.e. HTML title attribute)
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,94 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    
+    
+    <property>
+        <name>for</name><classname>java.lang.String</classname><description>
+            The client identifier of the component for which this component
+            represents associated message(s)
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,82 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>escape</name><classname>java.lang.String</classname><description>
+            Indicates whether rendered markup should be escaped.
+            Default: true
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,155 @@
+<properties>
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of a backing bean</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>align</name><classname>java.lang.String</classname><description>left|center|right [CI]
+            Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values:
+            
+            * left: The table is to the left of the document.
+            * center: The table is to the center of the document.
+            * right: The table is to the right of the document
+            
+        </description>
+    </property>
+    <property>
+        <name>border</name><classname>java.lang.String</classname><description>This attributes specifies the width (in pixels only) of the frame around a table</description>
+    </property>
+    <property>
+        <name>bgcolor</name><classname>java.lang.String</classname><description>    Deprecated. This attribute sets the background color for the document body or table cells.
+            
+            This attribute sets the background color of the canvas for the document body (the BODY element) or for tables (the TABLE, TR, TH, and TD elements). Additional attributes for specifying text color can be used with the BODY element.
+            
+            This attribute has been deprecated in favor of style sheets for specifying background color information
+        </description>
+    </property>
+    <property>
+        <name>cellpadding</name><classname>java.lang.String</classname><description>    This attribute specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is percentage length, the top and bottom margins should be equally separated from the content based on percentage of the available vertical space, and the left and right margins should be equally separated from the content based on percentage of the available horizontal space
+            
+        </description>
+    </property>
+    <property>
+        <name>cellspacing</name><classname>java.lang.String</classname><description>This attribute specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells</description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>frame</name><classname>java.lang.String</classname><description>void|above|below|hsides|lhs|rhs|vsides|box|border [CI]
+            This attribute specifies which sides of the frame surrounding a table will be visible. Possible values:
+            
+            * void: No sides. This is the default value.
+            * above: The top side only.
+            * below: The bottom side only.
+            * hsides: The top and bottom sides only.
+            * vsides: The right and left sides only.
+            * lhs: The left-hand side only.
+            * rhs: The right-hand side only.
+            * box: All four sides.
+            * border: All four sides
+            
+        </description>
+    </property>
+    <property>
+        <name>rules</name><classname>java.lang.String</classname><description>This attribute specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. Possible values:
+            
+            * none: No rules. This is the default value.
+            * groups: Rules will appear between row groups (see THEAD, TFOOT, and TBODY) and column groups (see COLGROUP and COL) only.
+            * rows: Rules will appear between rows only.
+            * cols: Rules will appear between columns only.
+            * all: Rules will appear between all rows and columns
+        </description>
+    </property>
+    <property>
+        <name>summary</name><classname>java.lang.String</classname><description>This attribute provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille</description>
+    </property>
+    <property>
+        <name>width</name><classname>java.lang.String</classname><description>Image and object width override. When specified, the width and height attributes tell user agents to override the natural image or object size in favor of these values</description>
+    </property>
+    
+    
+    <property>
+        <name>columnClasses</name><classname>java.lang.String</classname>
+    </property>
+    <property>
+        <name>columns</name><classname>java.lang.String</classname>
+    </property>
+    <property>
+        <name>footerClass</name><classname>java.lang.String</classname>
+    </property>
+    <property>
+        <name>headerClass</name><classname>java.lang.String</classname>
+    </property>
+    <property>
+        <name>rowClasses</name><classname>java.lang.String</classname>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,63 @@
+<properties>
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description>Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,85 @@
+<properties>
+    
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,146 @@
+<properties>
+    
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The 
+            
+            language of the alternate text is specified by the lang attribute
+        </description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>An element is selected</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    
+    
+    <property>
+        <name>layout</name><classname>java.lang.String</classname><description>see JSF Spec. 8.5.9</description>
+    </property>
+    
+    <property>
+        <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class is for enabled elements</description>
+    </property>
+    <property>
+        <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class is for disabled elements</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,134 @@
+<properties>
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    
+    <property>
+        <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description>
+    </property>
+    <property>
+        <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class is for enabled elements</description>
+    </property>
+    <property>
+        <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class is for disabled elements</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,130 @@
+<properties>
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>The initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description>A flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during Process Validations phase of a request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description>A Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to apply when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description>An advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description>A JavaScript code. The onblur event occurs when an element loses focus either by a pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+    </property>
+    
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767.A User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>A flag indicating that this component prohibits
+            changes by a user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    <property>
+        <name>enabledClass</name><classname>java.lang.String</classname><description>A CSS class for enabled elements</description>
+    </property>
+    <property>
+        <name>disabledClass</name><classname>java.lang.String</classname><description>A CSS class for disabled elements</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,134 @@
+<properties>
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>The initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until a Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component is checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during Process Validations phase of a request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>An alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description>A code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to apply when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to an HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to a specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves a source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description>
+    </property>
+    
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    
+    <property>
+        <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description>
+    </property>
+    <property>
+        <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class for enabled elements</description>
+    </property>
+    <property>
+        <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class for disabled elements</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,130 @@
+<properties>
+    
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>Method Binding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    
+    
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description>
+    </property>
+    
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    <property>
+        <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class for enabled elements</description>
+    </property>
+    <property>
+        <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class for disabled elements</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,148 @@
+<properties>
+    
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description>A flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until a Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+    <property>
+        <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description>
+    </property>
+    <property>
+        <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description>
+    </property>
+    <property>
+        <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description>
+    </property>
+    <property>
+        <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description>
+    </property>
+    <property>
+        <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description>
+    </property>
+    
+    
+    <property>
+        <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description>
+    </property>
+    <property>
+        <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick  event handler</description>
+    </property>
+    <property>
+        <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description>
+    </property>
+    <property>
+        <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description>
+    </property>
+    <property>
+        <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description>
+    </property>
+    <property>
+        <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description>
+    </property>
+    <property>
+        <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description>
+    </property>
+    <property>
+        <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description>
+    </property>
+    <property>
+        <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description>
+    </property>
+    <property>
+        <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description>
+    </property>
+    
+    
+    <property>
+        <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description>
+    </property>
+    <property>
+        <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The 
+            
+            language of the alternate text is specified by the lang attribute
+        </description>
+    </property>
+    <property>
+        <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description>
+    </property>
+    <property>
+        <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description>
+    </property>
+    <property>
+        <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description>
+    </property>
+    <property>
+        <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
+    </property>
+    <property>
+        <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+    </property>
+    <property>
+        <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+    </property>
+    <property>
+        <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description>
+    </property>
+    <property>
+        <name>onselect</name><classname>java.lang.String</classname><description>An element is selected</description>
+    </property>
+    <property>
+        <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
+            changes by the user.  The element may receive focus
+            unless it has also been disabled
+        </description>
+    </property>
+    <property>
+        <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description>
+    </property>
+    
+    
+    <property>
+        <name>layout</name><classname>java.lang.String</classname><description>see JSF Spec. 8.5.10</description>
+    </property>
+    <property>
+        <name>border</name><classname>java.lang.String</classname><description>see JSF Spec. 8.5.10</description>
+    </property>
+    <property>
+        <name>enabledClass</name><classname>java.lang.String</classname>standard_select_one_radio_attributes
+    </property>
+    <property>
+        <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class is for disabled elements</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,5 @@
+<properties>
+    
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,45 @@
+<properties>
+    <!-- common attributes for action component -->
+    
+    &ui_component_attributes;
+    
+    <property  attachedstate="true">
+        <name>action</name>
+        <classname>javax.faces.el.MethodBinding</classname>
+        <description>
+            MethodBinding pointing at the application action to be invoked,
+            if this UIComponent is activated by the user, during the Apply
+            Request Values or Invoke Application phase of the request
+            processing lifecycle, depending on the value of the immediate
+            property
+        </description>
+        <methodargs> </methodargs>
+    </property>
+    <property elonly="true"  attachedstate="true">
+        <name>actionListener</name>
+        <classname>javax.faces.el.MethodBinding</classname>
+        <description>
+            MethodBinding pointing at method accepting  an ActionEvent with return type void
+        </description>
+        <methodargs>javax.faces.event.ActionEvent.class</methodargs>
+    </property>
+    <property>
+        <name>immediate</name>
+        <classname>boolean</classname>
+        <description>
+            True means, that the default ActionListener should be executed
+            immediately (i.e. during Apply Request Values phase of the
+            request processing lifecycle), rather than waiting until the
+            Invoke Application phase
+        </description>
+    </property>
+    <property>
+        <name>value</name>
+        <classname>java.lang.Object</classname>
+        <description>
+            The current value for this component
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,25 @@
+<properties>
+    <!-- Attributes  applicable to all JSF components -->
+    <property existintag="true" exist="true" el="false">
+        <name>id</name>
+        <classname>java.lang.String</classname>
+        <description>
+            Every component may have a unique id that is automatically created if omitted
+        </description>
+    </property>
+    <property>
+        <name>rendered</name>
+        <classname>boolean</classname>
+        <description>
+            If "false", this component is not rendered
+        </description>
+    </property>
+    <property existintag="true" exist="true" el="true" elonly="true">
+        <name>binding</name>
+        <classname>java.lang.String</classname>
+        <description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,37 @@
+<properties>
+    <property>
+        <name>first</name>
+        <classname>int</classname>
+        <description>
+            A zero-relative row number of the first row to display
+        </description>
+    </property>
+    <property>
+        <name>rows</name>
+        <classname>int</classname>
+        <description>
+            A number of rows to display, or zero for all remaining
+            rows in the table
+        </description>
+    </property>
+    <property>
+        <name>var</name>
+        <classname>java.lang.String</classname>
+        <description>
+            A request-scope attribute via which the data object for the
+            current row will be used when iterating
+        </description>
+    </property>
+    <property disabled="true">
+        <name>rowIndex</name>
+        <description>An index of row</description>
+    </property>
+    <property disabled="true">
+        <name>header</name>
+        <description>A header of a table</description>
+    </property>
+    <property disabled="true">
+        <name>footer</name>
+        <description>A footer of a table</description>
+    </property>
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,13 @@
+<properties>
+    <!-- Attribute  'for' used for point to other component -->
+    <property>
+        <name>for</name>
+        <classname>java.lang.String</classname>
+        <description><![CDATA[
+		id (or full path of id's) of target components, for which this element must provide support.
+		If a target component inside of the same <code>NamingContainer</code> (UIForm, UIData in base implementations), can be simple value of the "id" attribute.
+		For other cases must include id's of <code>NamingContainer</code> components, separated by ':'. For search from the root of components, must be started with ':'.
+		]]>
+        </description>
+    </property>
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,6 @@
+<properties>
+    
+    &ui_component_attributes;
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,11 @@
+<properties>
+    &ui_component_attributes;
+    <property>
+        <name>value</name>
+        <alias>url</alias>
+        <classname>java.lang.Object</classname>
+        <description>URL of the image (see JSF.4.1.5)</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,38 @@
+<properties>
+    &ui_output_attributes;
+    
+    <property>
+        <name>immediate</name>
+        <classname>boolean</classname>
+        <description>
+            A flag indicating that this component value must be converted
+            and validated immediately (that is, during Apply Request Values
+            phase), rather than waiting until a Process Validations phase
+        </description>
+    </property>
+    <property>
+        <name>required</name>
+        <classname>boolean</classname>
+        <description>
+            If "true", this component is checked for non-empty input
+        </description>
+    </property>
+    <property  attachedstate="true">
+        <name>validator</name>
+        <classname>javax.faces.el.MethodBinding</classname>
+        <methodargs> </methodargs>
+        <description>
+            MethodBinding pointing at a method that is called during
+            Process Validations phase of the request processing lifecycle,
+            to validate the current value of this component
+        </description>
+    </property>
+    <property  attachedstate="true">
+        <name>valueChangeListener</name>
+        <classname>javax.faces.el.MethodBinding</classname>
+        <methodargs> </methodargs>
+        <description>Listener for value changes</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,32 @@
+<properties>
+    &ui_component_attributes;
+    <property>
+        <name>for</name>
+        <classname>java.lang.String</classname>
+        <description>
+            A client identifier of the component for which this component
+            represents associated message(s)
+        </description>
+    </property>
+    <property>
+        <name>showSummary</name>
+        <classname>boolean</classname>
+        <description>
+            Indicates whether the summary of associated message(s)
+            should be displayed. Default is: true
+        </description>
+        <defaultvalue>true</defaultvalue>
+    </property>
+    <property>
+        <name>showDetail</name>
+        <classname>boolean</classname>
+        <description>
+            Indicates whether the detail of associated message(s) should
+            be displayed. Default is: false
+        </description>
+        <defaultvalue>false</defaultvalue>
+    </property>
+    
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,41 @@
+<properties>
+    &ui_component_attributes;
+    <property>
+        <name>for</name>
+        <classname>java.lang.String</classname>
+        <description>
+            A client identifier of the component for which this component
+            represents associated message(s)
+        </description>
+    </property>
+    <property>
+        <name>showSummary</name>
+        <classname>boolean</classname>
+        <description>
+            Indicates whether the summary of associated message(s)
+            should be displayed. Default is: true
+        </description>
+        <defaultvalue>true</defaultvalue>
+    </property>
+    <property>
+        <name>showDetail</name>
+        <classname>boolean</classname>
+        <description>
+            Indicates whether the detail of the associated message(s) should
+            be displayed. Default is: false
+        </description>
+        <defaultvalue>false</defaultvalue>
+    </property>
+    <property>
+        <name>globalOnly</name>
+        <classname>boolean</classname>
+        <description>
+            Indicates whether only global messages (that is, messages with
+            no associated client identifier) should be rendered. Default is:
+            false
+        </description>
+        <defaultvalue>false</defaultvalue>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,19 @@
+<properties>
+    &ui_component_attributes;
+    <property>
+        <name>value</name>
+        <classname>java.lang.Object</classname>
+        <description>
+            The initial value to set when rendered for the first time
+        </description>
+    </property>
+    <property  attachedstate="true">
+        <name>converter</name>
+        <classname>javax.faces.convert.Converter</classname>
+        <description>
+            Id of Converter to be used or reference to a Converter
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,13 @@
+<properties>
+    
+    
+    
+    &ui_component_attributes;
+    
+    <property>
+        <name>layout</name>
+        <classname>java.lang.String</classname>
+        <description>It defines a visual layout of a panel, it can be "block" or "inline"</description>
+    </property>
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,24 @@
+<properties>
+    &ui_component_attributes;
+    <!-- Disable - not applicable for param -->
+    <property exist="true" existintag="true" hidden="true">
+        <name>rendered</name>
+        <classname>boolean</classname>
+        <description>
+            If "false", this component isn't rendered
+        </description>
+    </property>
+    
+    <property>
+        <name>name</name>
+        <classname>java.lang.String</classname>
+        <description>A name of this parameter</description>
+    </property>
+    <property>
+        <name>value</name>
+        <classname>java.lang.Object</classname>
+        <description>An initial value or a value binding</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,6 @@
+<properties>
+    &ui_input_attributes;
+    
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,44 @@
+<properties>
+    &ui_component_attributes;
+    <!-- Disable - not applicable for param -->
+    <property exist="true" existintag="true" hidden="true">
+        <name>rendered</name>
+        <classname>boolean</classname>
+        <description>
+            If "false", this component isn't rendered
+        </description>
+    </property>
+    
+    <property>
+        <name>itemDisabled</name>
+        <classname>boolean</classname>
+        <description>
+            If "true", this component isn't saved during state saving
+        </description>
+    </property>
+    <property>
+        <name>itemDescription</name>
+        <classname>java.lang.String</classname>
+        <description>A description used by tools only</description>
+    </property>
+    <property>
+        <name>itemLabel</name>
+        <classname>java.lang.String</classname>
+        <description>A text shown by the item</description>
+    </property>
+    <property>
+        <name>itemValue</name>
+        <classname>java.lang.Object</classname>
+        <description>Item value, which is passed to the server as a request parameter</description>
+    </property>
+    <property>
+        <name>value</name>
+        <classname>java.lang.Object</classname>
+        <description>
+            A value reference pointing at a javax.faces.model.SelectItem
+            instance
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,21 @@
+<properties>
+    &ui_component_attributes;
+    <!-- Disable - not applicable for param -->
+    <property exist="true" existintag="true" hidden="true">
+        <name>rendered</name>
+        <classname>boolean</classname>
+        <description>
+            If "false", this component isn't rendered
+        </description>
+    </property>
+    <property>
+        <name>value</name>
+        <classname>java.lang.Object</classname>
+        <description>
+            A value reference pointing at a List or Array of
+            javax.faces.model.SelectItem instances
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,40 @@
+<properties>
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>The initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description>A flag indicating that this component value must be converted and validated immediately (that is, during an Apply Request Values phase), rather than waiting until a Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component is checked for a non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,40 @@
+<properties>
+    
+    
+    
+    
+    
+    <property>
+        <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description>
+    </property>
+    <property>
+        <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description>
+    </property>
+    <property>
+        <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of
+a backing bean</description>
+    </property>
+    
+    <property>
+        <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description>
+    </property>
+    <property>
+        <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description>
+    </property>
+    
+    <property>
+        <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component value must be converted and validated immediately (that is, during an Apply Request Values phase), rather than waiting until Process Validations phase</description>
+    </property>
+    <property>
+        <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description>
+    </property>
+    <property>
+        <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during a Process Validations phase of the request processing lifecycle, to validate the current value of this component</description>
+    </property>
+    <property>
+        <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description>
+    </property>
+    
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,22 @@
+<properties>
+    <property>
+        <name>enabledOnUserRole</name>
+        <classname>boolean</classname>
+        <description>
+            If a user is in the given role, this component is rendered
+            normally. If not, no hyperlink is rendered but all nested tags
+            (=body) are rendered
+        </description>
+    </property>
+    <property>
+        <name>visibleOnUserRole</name>
+        <classname>boolean</classname>
+        <description>
+            If a user is in given role, this component will be rendered
+            normally. If not, nothing is rendered and the body of this tag
+            is skipped
+        </description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,14 @@
+<properties>
+    <property>
+        <name>minimum</name>
+        <classname>int</classname>
+        <description>A minimum possible value within an optional range</description>
+    </property>
+    <property>
+        <name>maximum</name>
+        <classname>int</classname>
+        <description> A maximum within an optional range</description>
+    </property>
+    
+    
+</properties>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,12 @@
+#macro( quietnull $a)
+
+#if($a)$a#end
+
+#end
+
+
+
+
+
+
+

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,202 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+#if(${generator.key})
+
+import java.io.IOException;
+import javax.faces.FacesException;
+import org.ajax4jsf.framework.util.base64.Codec;
+#end
+
+/**
+ * Component-Type ${component.name}
+ * Component-Family ${component.family}
+  	#if(${component.renderer})
+ * Renderer-Type ${component.renderer.name}
+  	#end
+ * ${component.xmlEncodedDescription}
+ */
+ public class $component.simpleClassName extends $component.superclass {
+
+  public static final String COMPONENT_TYPE = "${component.name}";
+
+  /**
+   *  Constructor to init default renderers 
+   */ 
+  public $component.simpleClassName (){
+  	#if(${component.renderer})
+  	setRendererType("${component.renderer.name}");
+  	#end
+  }
+
+// Component properties fields
+#set( $fiedCounter = 1 )
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	/**
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	 #if($prop.simpleType)
+	 private $prop.simpleClassName  _$prop.name = ${prop.defaultvalue};		
+	/**
+	 * Flag indicated what $prop.name is set.
+	 */
+	 private boolean _${prop.name}Set = false;	
+	 #set( $fiedCounter = $fiedCounter+2)
+	 #else
+	 private $prop.simpleClassName  _$prop.name = null; /* Default is ${prop.defaultvalue}*/
+	 #set( $fiedCounter = $fiedCounter+1)
+	 #end
+#end	 
+#end
+
+// Getters-setters
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Setter for $prop.name
+	 * @param $prop.name - new value
+	 */
+	 public void ${prop.setterName}( $prop.simpleClassName  __$prop.name ){
+		this._${prop.name} = __$prop.name;
+	 #if($prop.simpleType)
+		this._${prop.name}Set = true;
+	 #end
+	 }
+
+
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Getter for $prop.name
+	 * @return $prop.name value from local variable or value bindings
+	 */
+	 public $prop.simpleClassName ${prop.getterName}(  ){
+	 #if($prop.simpleType)
+		 if(this._${prop.name}Set){
+			return this._${prop.name};
+		 }
+    	ValueBinding vb = getValueBinding("${prop.name}");
+    	if (vb != null) {
+    	    ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext());
+    	    if (null == value) {
+    			return this._${prop.name};
+    	    }
+    	    return (value.${prop.classname}Value());
+    	} else {
+    	    return (this._${prop.name});
+    	}
+	 #else
+        if (null != this._${prop.name})
+        {
+            return this._${prop.name};
+        #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding"))
+	    }
+        ValueBinding vb = getValueBinding("${prop.name}");
+        if (null != vb){
+            return (${prop.simpleClassName})vb.getValue(getFacesContext());
+		#end
+        } else {
+            return ${prop.defaultvalue};
+        }
+	 #end
+	 }
+	 #if($prop.raw)
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Raw Setter for $prop.name
+	 * @param $prop.name - new value
+	 */
+	 public void ${prop.setterName}Raw( $prop.simpleClassName  __$prop.name ){
+		this._${prop.name} = __$prop.name;
+	 }
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Raw ( bypadd bindings ) Getter for $prop.name
+	 * @return $prop.name value from local variable 
+	 */
+	 public $prop.simpleClassName ${prop.getterName}Raw(  ){
+			return this._${prop.name};
+	 }
+	 #end
+ #end	 
+#end
+
+#if( ${component.family}  )
+// Component family.
+	public static final String COMPONENT_FAMILY = "${component.family}";
+
+	public String getFamily() {
+		return COMPONENT_FAMILY;
+	}
+#end
+
+// Save state
+// ----------------------------------------------------- StateHolder Methods
+
+
+    public Object saveState(FacesContext context) {
+        Object values[] = new Object[${fiedCounter}];
+        values[0] = super.saveState(context);
+#set($currentField = 1)
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	 #if($prop.simpleType)		
+       values[${currentField}] = new ${prop.boxingClass}(_$prop.name);
+	   #set( $currentField = $currentField+1)
+	   values[${currentField}] = Boolean.valueOf(_${prop.name}Set);	
+	   #set( $currentField = $currentField+1)
+	 #else
+	   #if(!${prop.attachedstate} )
+       values[${currentField}] = _$prop.name;
+	   #else
+       values[${currentField}] = saveAttachedState(context, _$prop.name );		
+	   #end
+	   #set( $currentField = $currentField+1)
+	 #end
+	
+ #end	 
+#end
+	  return values;
+   }
+   
+
+    public void restoreState(FacesContext context, Object state) {
+        Object values[] = (Object[]) state;
+        super.restoreState(context, values[0]);
+#set($currentField = 1)
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	 #if($prop.simpleType)		
+       _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value();
+	   #set( $currentField = $currentField+1)
+	   _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue();	
+	   #set( $currentField = $currentField+1)
+	 #else
+	   #if( !${prop.attachedstate} )
+       _$prop.name = (${prop.simpleClassName})values[${currentField}] ;
+	   #else
+       _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] );		
+	   #end
+	   #set( $currentField = $currentField+1)
+	 #end
+	
+ #end	 
+#end
+	
+		
+	}	
+// Utilites
+
+}
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,149 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import ${component.classname};
+
+public class $tag.simpleClassName extends $tag.superclass {
+
+// Fields
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	/*
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	 private String  _$prop.name = null;
+
+ #end	 
+#end
+// Setters
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	/*
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	/*
+	 * $prop.description
+	 * Setter for $prop.name
+	 * @param $prop.name - new value
+	 */
+	 public void ${prop.setterName}( String  __${prop.name} ){
+		this._${prop.name} = __${prop.name};
+     }
+	 
+ #end
+ #if( $prop.alias)
+	/*
+	 * ${prop.xmlEncodedDescription}
+	 * Setter for alias of $prop.name as $prop.alias
+	 * @param $prop.name - new value
+	 */
+	 public void set${prop.upperFirstChar($prop.alias)}( String  __${prop.alias} ){
+		this.${prop.setterName}(__${prop.alias});
+     }
+ #end
+#end 	 
+// Release
+
+    /* (non-Javadoc)
+     * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#release()
+     */
+    public void release()
+    {
+        // TODO Auto-generated method stub
+        super.release();
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	    this._${prop.name} = null;
+ #end	 
+#end
+	}
+	
+    /* (non-Javadoc)
+     * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#setProperties(javax.faces.component.UIComponent)
+     */
+    protected void setProperties(UIComponent component)
+    {
+        // TODO Auto-generated method stub
+        super.setProperties(component);
+	
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+		 #if(!$prop.el)
+			if(isValueReference(this._${prop.name})){
+				throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}")
+			}
+		 #end	
+		 #if($prop.name == "action")
+			setActionProperty(component, this._${prop.name});
+		 #elseif($prop.name == "actionListener")
+			setActionListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "converter")
+			setConverterProperty(component, this._${prop.name});
+		 #elseif($prop.name == "validator")
+			setValidatorProperty(component, this._${prop.name});
+		 #elseif($prop.name == "valueChangeListener")
+			setValueChangedListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "value")
+			setValueProperty(component, this._${prop.name});
+		 #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
+			setValueBinding(component, "${prop.name}",this._${prop.name});
+		 #elseif(${prop.simpleType})
+			// Simple type - ${prop.simpleClassName}
+			set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
+			set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif( $prop.classname == "java.lang.String")
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.classname == "java.lang.Object")
+			// TODO - handle object
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+			if(null != this._${prop.name}){
+             if (isValueReference(this._${prop.name}))
+             {
+                MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name},
+                                                                                new Class[]{${prop.methodargs}});
+                ((${component.simpleClassName})component).${prop.setterName}(mb);
+             }
+             else
+             {
+                getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name});
+             }
+			}
+		 #else
+			// TODO - setup properties for other cases.
+			// name ${prop.name} with type $prop.classname
+		 #end	
+ #end	 
+#end
+   }
+	
+	/* (non-Javadoc)
+	 * @see javax.faces.webapp.UIComponentTag#getComponentType()
+	 */
+	public String getComponentType() {
+		// TODO Auto-generated method stub
+		return "${component.name}";
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.faces.webapp.UIComponentTag#getRendererType()
+	 */
+	public String getRendererType() {
+		#if($renderer)
+		return "${renderer.name}";
+		#else
+		return null;
+		#end
+	}
+
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,156 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+import com.gargoylesoftware.htmlunit.Page;
+import javax.faces.component.UIForm;
+import javax.faces.component.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.component.UIViewRoot;
+
+import org.ajax4jsf.tests.MockValueBinding;
+
+//import ${component.classname};
+#if(${generator.key})
+
+import java.io.IOException;
+import javax.faces.FacesException;
+import org.ajax4jsf.framework.util.base64.Codec;
+#end
+
+public class $component.test.simpleClassName extends $component.test.superclassname {
+
+//  public static final String COMPONENT_TYPE = "${component.name}";
+
+
+#set( $fiedCounter = 1 )
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	 #if($prop.simpleType)
+	 private boolean _${prop.name}Set = false;	
+	 #set( $fiedCounter = $fiedCounter+2)
+	 #else
+	 #set( $fiedCounter = $fiedCounter+1)
+	 #end
+#end	 
+#end
+  
+  private $component.simpleClassName component;
+  private UIForm form;
+//  private FacesContext context;
+
+  /**
+   *  Constructor to init default renderers 
+   */ 
+  public $component.test.simpleClassName (String name){
+  	super(name);
+  }
+
+	/*
+	* setup the tets
+	*/
+	public void setUp() throws Exception {
+		super.setUp();
+		component = new ${component.simpleClassName}();
+		form = new HtmlForm();
+		form.setId("form");
+		facesContext.getViewRoot().getChildren().add(form);
+		
+		component.setId("component");
+#foreach( $prop in $component.properties )
+	#if(!$prop.exist && !$prop.elonly && !$prop.classname.startsWith("javax.faces."))
+		component.${prop.setterName}($testDataGenerator.getTestData(${prop}) );
+	 #end
+#end
+		
+		form.getChildren().add(component);
+		
+	}
+
+	/*
+	* setup the tets
+	*/
+	public void tearDown() throws Exception{
+		super.tearDown();
+		component = null;
+		form = null;
+	}
+
+	public void testComponent() throws Exception {
+	  	#if(${component.renderer})
+			assertEquals("${component.renderer.name}", component.getRendererType());
+	  	#end
+
+/*		
+		HtmlPage renderedView = renderView();
+		assertNotNull(renderedView);
+    	System.out.println(renderedView.getWebResponse().getContentAsString());
+    	HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId());
+    	assertNotNull(element);
+*/    	
+//    	values[0] = component.saveState(facesContext);
+    	
+	}
+/*
+	public void testDefaultValues(){
+		
+	}
+*/
+	public void testContext(){
+		
+		Object state = component.saveState(facesContext);
+/*		
+    	UIViewRoot root = facesContext.getViewRoot();
+    	root.processDecodes(facesContext);
+    	root.processValidators(facesContext);
+    	root.processUpdates(facesContext);
+    	root.processApplication(facesContext);
+*/
+		testRestoreState(state);
+	}
+
+	public void testGetters() {
+		${component.simpleClassName} component = new ${component.simpleClassName}();
+		
+#foreach( $prop in $component.properties )
+	#if(!$prop.exist && !$prop.elonly && !$prop.classname.startsWith("javax.faces."))
+		component.setValueBinding("${prop.name}", new MockValueBinding($testDataGenerator.getTestVeData(${prop}), ${testDataGenerator.getTestVeClass(${prop})}.class));
+		assertEquals($testDataGenerator.getTestData(${prop}), component.${prop.getterName}());
+		component.${prop.setterName}($testDataGenerator.getTestData1(${prop}) );
+		assertEquals($testDataGenerator.getTestData1(${prop}), component.${prop.getterName}());
+	 #end
+#end
+
+
+	}
+	
+	private void testRestoreState(Object state){
+		${component.simpleClassName} restoredComponent = new ${component.simpleClassName}();
+		restoredComponent.restoreState(facesContext, state);
+		
+#foreach( $prop in $component.properties )
+	#if(!$prop.exist)
+		assertEquals(component.${prop.getterName}(), restoredComponent.${prop.getterName}());
+	 #end
+#end
+
+	}
+	
+	private void assertEquals(double d1, double d2) {
+		assertEquals(d1, d2, 0);
+	}
+	
+	private void assertEquals(float d1, float d2) {
+		assertEquals(d1, d2, 0);
+	}
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,221 @@
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+ import javax.faces.context.FacesContext;
+ import javax.faces.el.ValueBinding;
+import javax.faces.component.StateHolder;
+ 
+ /**
+  * Converter-Id ${converter.id}
+  * ${converter.xmlEncodedDescription}
+  */
+ 
+public class $converter.simpleClassName extends $converter.superclass #if(${converter.stateHolderRequired} && !${converter.superclassImplementsStateHolder})implements StateHolder#end
+ {
+ 
+   public static final String CONVERTER_ID = "${converter.id}";
+
+   
+ 
+ // Conveter properties fields
+
+#set( $fieldCounter = 0 )
+ #foreach( $prop in $converter.properties )
+
+#if( !$prop.exist )
+   /**
+    * $prop.name
+    * ${prop.xmlEncodedDescription}
+    */
+
+#if($prop.simpleType)
+   private $prop.simpleClassName  _$prop.name = ${prop.defaultvalue};		
+   /**
+    * Flag indicated that $prop.name is set.
+    */
+   private boolean _${prop.name}Set = false;	
+#set( $fieldCounter = $fieldCounter+2)
+#else
+   private $prop.simpleClassName  _$prop.name = null; /* Default is ${prop.defaultvalue}*/
+#set( $fieldCounter = $fieldCounter+1)
+ #end
+#end	 
+#end
+ 
+ // Getters and setters
+ #foreach( $prop in $converter.properties )
+
+#if( !$prop.exist )
+   /**
+    * ${prop.xmlEncodedDescription}
+    * Setter for $prop.name
+	*/
+   public void ${prop.setterName}( $prop.simpleClassName  __$prop.name )
+   {
+     this._${prop.name} = __$prop.name;
+
+#if($prop.simpleType)
+ 	this._${prop.name}Set = true;
+
+#end
+   }
+ 
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Getter for $prop.name
+   * @return $prop.name value from local variable or value binding
+   */
+   public $prop.simpleClassName ${prop.getterName}()
+   {
+     ValueBinding vb = getValueBinding("${prop.name}");
+
+#if($prop.simpleType)
+     if(this._${prop.name}Set)
+     {
+ 	  return this._${prop.name};
+
+         return (this._${prop.name});
+       }
+     }
+
+#else
+     if (null != this._${prop.name}) 
+     {
+       return this._${prop.name};
+     }
+
+#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding"))
+     else if (null != vb)
+     {
+       return (${prop.simpleClassName})vb.getValue(getFacesContext());
+     }
+
+#end
+     else
+     {
+       return ${prop.defaultvalue};
+     }
+
+#end
+  }
+ 	#if($prop.raw)
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Raw Setter for $prop.name
+   * @param $prop.name - new value
+   */
+
+   {
+     return this._${prop.name};
+   }
+ #end
+#end	 
+#end
+ 
+#if($converter.stateHolderRequired)
+ 
+  // Save state
+  // ----------------------------------------------------- StateHolder Methods
+
+  private boolean _transient;
+
+#if(${converter.superclassImplementsStateHolder})
+#set($currentField=1)
+#set($fieldCounter = $fieldCounter+1)
+#else
+#set($currentField=0)
+#end
+   public Object saveState(FacesContext context) {
+
+#if(${converter.superSaveStateMethodExists})
+    Object values[] = new Object[${fieldCounter}];
+     values[0] = super.saveState(context);
+#else
+    Object values[] = new Object[${fieldCounter}];
+#end
+#foreach( $prop in $converter.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+     values[${currentField}] = new ${prop.boxingClass}(_$prop.name);
+#set( $currentField = $currentField+1)
+    values[${currentField}] = Boolean.valueOf(_${prop.name}Set);	
+#set( $currentField = $currentField+1)
+#else
+#if(!${prop.attachedstate} )
+     values[${currentField}] = _$prop.name;
+#else
+     values[${currentField}] = saveAttachedState(context, _$prop.name );		
+ #end
+
+#set( $currentField = $currentField+1)
+#end	
+#end	 
+#end
+	return values;
+   }
+    
+
+#if(${converter.superclassImplementsStateHolder})
+#set($currentField=1)
+#else
+#set($currentField=0)
+#end
+   public void restoreState(FacesContext context, Object state) {
+#if(${converter.superRestoreStateMethodExists})
+     Object values[] = (Object[]) state;
+     super.restoreState(context, values[0]);
+#else
+    Object values[] = (Object[]) state;
+#end
+#foreach( $prop in $converter.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+     _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value();
+#set( $currentField = $currentField+1)
+    _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue();	
+#set( $currentField = $currentField+1)
+#else
+#if( !${prop.attachedstate} )
+     _$prop.name = (${prop.simpleClassName})values[${currentField}] ;
+#else
+     _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] );		
+ #end
+#set( $currentField = $currentField+1)
+#end
+ 	
+#end	 
+#end
+  }
+  
+#if(!$converter.superIsTransientMethodExists)
+  public boolean isTransient()
+  {
+    return _transient;
+  }
+#end
+ 
+#if(!$converter.superSetTransientMethodExists)
+  public void setTransient(boolean newTransientValue)
+  {
+    this._transient = newTransientValue;
+  }
+#end
+
+#end
+	  
+  // Utilites
+
+  private FacesContext getFacesContext()
+  {
+    return FacesContext.getCurrentInstance();
+  }
+  
+  private ValueBinding getValueBinding(String name)
+  {
+    return getFacesContext().getApplication().createValueBinding(name);
+  }
+
+ }

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,95 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import javax.faces.convert.Converter;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import org.apache.commons.beanutils.ConvertUtils;
+import javax.servlet.jsp.JspException;
+import ${converter.classname};
+
+public class $tag.simpleClassName extends $tag.superclass 
+{
+
+// Fields
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.name
+   * ${prop.xmlEncodedDescription}
+   */
+  private String  _$prop.name = null;
+
+#end	 
+#end
+// Setters
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.description
+   * Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}(String  __${prop.name}) 
+  {
+    this._${prop.name} = __${prop.name};
+  }
+	 
+#end
+#if( $prop.alias)
+  /*
+   * ${prop.xmlEncodedDescription}
+   * Setter for alias of $prop.name as $prop.alias
+   * @param $prop.name - new value
+   */
+  public void set${prop.upperFirstChar($prop.alias)}(String  __${prop.alias}) 
+  {
+    this.${prop.setterName}(__${prop.alias});
+  }
+#end
+#end
+
+  protected Converter createConverter() throws JspException 
+  {
+    ${converter.simpleClassName} converter = new ${converter.simpleClassName}();
+    _setProperties(converter);
+    return converter;
+  }
+
+  // Support method to wire in attributes
+  private void _setProperties(${converter.simpleClassName} converter) throws JspException 
+  {
+    FacesContext facesContext = FacesContext.getCurrentInstance();
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+    if (_${prop.name} != null) 
+    {
+#if( ${prop.el} )
+      if (UIComponentTag.isValueReference(_${prop.name})) 
+      {
+        ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name});
+        converter.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext));
+      }
+#if (!${prop.elonly})
+      else
+      {
+        converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+      }
+#end
+    }
+#else
+    converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+#end
+#end
+#end
+  }
+
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE facelet-taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
+	<namespace>${taglib.uri}</namespace>
+
+${taglib.includeContent}
+
+#foreach( $component in ${components})
+#if($component.tag)
+ <tag>
+  <tag-name>${component.tag.name}</tag-name>
+  <component>
+			<component-type>${component.name}</component-type>
+#if(${component.renderer})
+			<renderer-type>
+				${component.renderer.name}
+			</renderer-type>
+#end
+#if(${component.taghandler})
+		    <handler-class>
+				${component.taghandler.classname}
+			</handler-class>
+#end
+  </component>
+	
+ </tag>
+#end
+#end
+
+
+#foreach( $listener in ${listeners})
+ <tag>
+  <tag-name>${listener.name}</tag-name>
+#if(${listener.taghandler})
+		    <handler-class>
+				${listener.taghandler.classname}
+			</handler-class>
+#end
+	
+ </tag>
+#end
+
+</facelet-taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+                              "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+	
+${facesConfig.includeContent}
+
+#foreach( $validator in ${validators})
+  <validator>
+	<validator-id>${validator.id}</validator-id>
+	<validator-class>${validator.classname}</validator-class>
+	#if(${validator.description})
+	<description>${validator.description}</description>
+	#end
+	#if(${validator.displayname})
+	<display-name>${validator.displayname}</display-name>
+	#end
+	#if(${validator.icon})
+	<icon>${validator.icon}</icon>
+	#end
+  </validator>
+#end
+
+#foreach( $converter in ${converters})
+  <converter>
+	#if(${converter.id})
+	<converter-id>${converter.id}</converter-id>
+	#end
+	#if(${converter.forclass})
+	<converter-for-class>${converter.forclass}</converter-for-class>
+	#end
+
+	<converter-class>${converter.classname}</converter-class>
+
+	#if(${converter.description})
+	<description>${converter.description}</description>
+	#end
+	#if(${converter.displayname})
+	<display-name>${converter.displayname}</display-name>
+	#end
+	#if(${converter.icon})
+	<icon>${converter.icon}</icon>
+	#end
+  </converter>
+#end
+
+
+
+#foreach( $component in ${components})
+#if( $component.generate )
+  <component>
+  #if(${component.description})  
+	<description>${component.xmlEncodedDescription}</description>
+  #end
+  #if(${component.displayname})  
+	<display-name>${component.xmlEncodedDisplayname}</display-name>
+  #end
+    <component-type>${component.name}</component-type>
+    <component-class>${component.classname}</component-class>
+    
+#foreach( $facet in $component.facets)
+	<facet>
+  #if(${facet.description})  
+	<description>${facet.xmlEncodedDescription}</description>
+  #end
+  #if(${facet.displayname})  
+	<display-name>${facet.xmlEncodedDisplayname}</display-name>
+  #end
+      <facet-name>${facet.name}</facet-name>
+    </facet>
+#end
+	#if(${component.renderer})
+    <component-extension>
+      <component-family>${component.family}</component-family>
+      <renderer-type>${component.renderer.name}</renderer-type>
+    </component-extension>
+    #end
+  </component>
+#end
+#end
+
+#foreach( $renderkit in $facesConfig.renderKits)
+  <render-kit>
+		#if(${renderkit.renderkitid})
+		<render-kit-id>${renderkit.renderkitid}</render-kit-id>
+		#if(${renderkit.renderkitclass})
+		<render-kit-class>${renderkit.renderkitclass}</render-kit-class>
+		#end
+		#end
+#foreach( $component in $components)
+	#if($component.renderer)
+		#set($rendererClass = $renderkit.rendererClass($component.renderer.classname) )
+		#if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}"))
+  		<renderer>
+			<component-family>${component.family}</component-family>
+			<renderer-type>
+				${component.renderer.name}
+			</renderer-type>
+			<renderer-class>
+				${rendererClass}
+			</renderer-class>
+		</renderer>
+		#end
+	#end
+#end
+  </render-kit>
+#end
+
+
+</faces-config>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,101 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import ${listener.componentclass};
+
+import java.io.IOException;
+
+import javax.faces.*;
+import javax.faces.el.*;
+
+import javax.el.*;
+
+import com.sun.facelets.*;
+import com.sun.facelets.el.*;
+import com.sun.facelets.tag.*;
+import com.sun.facelets.tag.jsf.*;
+
+public class $tag.simpleClassName extends TagHandler {
+
+	private Class listenerType;
+
+    private final TagAttribute type;
+
+    private final TagAttribute binding;
+
+	public ${tag.simpleClassName}(TagConfig config) {
+	    super(config);
+		this.binding = this.getAttribute("binding");
+        this.type = this.getAttribute("type");
+        if (type != null) {
+            if (!type.isLiteral()) {
+                throw new TagAttributeException(this.tag, this.type, "Must be literal");
+            }
+            try {
+                this.listenerType = Class.forName(type.getValue());
+            } catch (Exception e) {
+                throw new TagAttributeException(this.tag, this.type, e);
+            }
+        }
+  	}
+
+  	 public void apply(FaceletContext ctx, UIComponent parent)
+            throws IOException, FacesException, FaceletException, ELException {
+        if (parent instanceof $listener.componentclass) {
+            // only process if parent was just created
+            if (parent.getParent() == null) {
+                ${listener.componentclass} src = (${listener.componentclass}) parent;
+                ${listener.listenerclass} listener = null;
+                ValueExpression ve = null;
+                if (this.binding != null) {
+                    ve = this.binding.getValueExpression(ctx,
+                            ${listener.listenerclass}.class);
+                    listener = (${listener.listenerclass}) ve.getValue(ctx);
+                }
+                if (listener == null) {
+                    try {
+                        listener = (${listener.listenerclass}) listenerType.newInstance();
+                    } catch (Exception e) {
+                        throw new TagAttributeException(this.tag, this.type, e.getCause());
+                    }
+                    if (ve != null) {
+                        ve.setValue(ctx, ve);
+                    }
+                }
+				#foreach($prop in $listener.properties)
+				 #if( !$prop.existintag )
+					TagAttribute attribute;
+					#if( $prop.required )
+					attribute = getRequiredAttribute("${prop.name}");
+					#else
+					attribute = getAttribute("${prop.name}");
+					#end
+		            if (attribute != null) {
+						ValueBinding binding;
+		
+						binding = new LegacyValueBinding(
+							attribute.getValueExpression(ctx, 
+							${prop.classname}.class));
+					
+			            listener.${prop.setterName}(binding);
+					}
+				 #end
+				#end
+
+                src.${listener.methodname}(listener);
+            }
+        } else {
+            throw new TagException(this.tag,
+                    "Parent is not of type ${listener.componentclass}, type is: " + parent);
+        }
+    }
+  	
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,25 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${package};
+
+import ${component.classname};
+import ${renderer.superclass};
+
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:15 $
+ *
+ */
+public class ${renderer.simpleClassName} extends ${renderer.superclass} {
+
+   /** 
+	 * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
+	 */
+	protected Class getComponentClass() {
+		// Expected component class for rendering
+		return ${component.simpleClassName}.class;
+	}
+
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+<!-- Include manual created resource -->
+${resourcesConfig.includeContent}
+
+#foreach( $key in ${classResources.keySet()})
+	<resource class="${classResources.get($key)}">
+		<name>${key}</name>
+	</resource>
+#end
+
+#foreach( $key in ${pathResources.keySet()})
+	<resource>
+		<name>${key}</name>
+		<path>${pathResources.get($key)}</path>
+	</resource>
+#end
+</resource-config>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,154 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import ${component.classname};
+
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:14 $
+ *
+ */
+public class $tag.simpleClassName extends $tag.superclass {
+
+// Fields
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	/*
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	 private String  _$prop.name = null;
+
+ #end	 
+#end
+// Setters
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	/*
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	/*
+	 * $prop.description
+	 * Setter for $prop.name
+	 * @param $prop.name - new value
+	 */
+	 public void ${prop.setterName}( String  __${prop.name} ){
+		this._${prop.name} = __${prop.name};
+     }
+	 
+ #end
+ #if( $prop.alias)
+	/*
+	 * ${prop.xmlEncodedDescription}
+	 * Setter for alias of $prop.name as $prop.alias
+	 * @param $prop.name - new value
+	 */
+	 public void set${prop.upperFirstChar($prop.alias)}( String  __${prop.alias} ){
+		this.${prop.setterName}(__${prop.alias});
+     }
+ #end
+#end 	 
+// Release
+
+    /* (non-Javadoc)
+     * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#release()
+     */
+    public void release()
+    {
+        // TODO Auto-generated method stub
+        super.release();
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	    this._${prop.name} = null;
+ #end	 
+#end
+	}
+	
+    /* (non-Javadoc)
+     * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#setProperties(javax.faces.component.UIComponent)
+     */
+    protected void setProperties(UIComponent component)
+    {
+        // TODO Auto-generated method stub
+        super.setProperties(component);
+	
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+		 #if(!$prop.el)
+			if(isValueReference(this._${prop.name})){
+				throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}");
+			}
+		 #end	
+		 #if($prop.name == "action")
+			setActionProperty(component, this._${prop.name});
+		 #elseif($prop.name == "actionListener")
+			setActionListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "converter")
+			setConverterProperty(component, this._${prop.name});
+		 #elseif($prop.name == "validator")
+			setValidatorProperty(component, this._${prop.name});
+		 #elseif($prop.name == "valueChangeListener")
+			setValueChangedListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "value")
+			setValueProperty(component, this._${prop.name});
+		 #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
+			setValueBinding(component, "${prop.name}",this._${prop.name});
+		 #elseif(${prop.simpleType})
+			// Simple type - ${prop.simpleClassName}
+			set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
+			set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif( $prop.classname == "java.lang.String")
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.classname == "java.lang.Object")
+			// TODO - handle object
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+			if(null != this._${prop.name}){
+             if (isValueReference(this._${prop.name}))
+             {
+                MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name},
+                                                                                new Class[]{${prop.methodargs}});
+                ((${component.simpleClassName})component).${prop.setterName}(mb);
+             }
+             else
+             {
+                getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name});
+             }
+			}
+		 #else
+			// TODO - setup properties for other cases.
+			// name ${prop.name} with type $prop.classname
+		 #end	
+ #end	 
+#end
+   }
+	
+	/* (non-Javadoc)
+	 * @see javax.faces.webapp.UIComponentTag#getComponentType()
+	 */
+	public String getComponentType() {
+		// TODO Auto-generated method stub
+		return "${component.name}";
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.faces.webapp.UIComponentTag#getRendererType()
+	 */
+	public String getRendererType() {
+		#if($renderer)
+		return "${renderer.name}";
+		#else
+		return null;
+		#end
+	}
+
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,102 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import ${component.classname};
+import com.sun.facelets.tag.jsf.ComponentHandler;
+import com.sun.facelets.tag.jsf.ComponentConfig;
+
+import com.sun.facelets.*;
+import com.sun.facelets.el.*;
+import com.sun.facelets.tag.*;
+/**
+ * @author shura (latest modification by $Author: ishabalov $)
+ * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:03 $
+ *
+ */
+public class $tag.simpleClassName extends $tag.superclass {
+
+
+  private static final ${tag.simpleClassName}MetaRule metaRule = new ${tag.simpleClassName}MetaRule();
+
+
+  
+  public ${tag.simpleClassName}(ComponentConfig config) 
+  {
+    super(config);
+  }
+// Metarule
+  protected MetaRuleset createMetaRuleset(Class type)
+  {
+    MetaRuleset m = super.createMetaRuleset(type);
+	m.addRule(metaRule);
+	return m;
+  }
+
+  	/**
+	 * @author shura (latest modification by $Author: ishabalov $)
+	 * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:03 $
+	 *
+	 */
+	static class ${tag.simpleClassName}MetaRule extends MetaRule{
+
+		/* (non-Javadoc)
+		 * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, com.sun.facelets.tag.TagAttribute, com.sun.facelets.tag.MetadataTarget)
+		 */
+		public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
+	        if (meta.isTargetInstanceOf(${component.simpleClassName}.class)) {
+		#foreach($prop in $component.properties)
+		 #if( !$prop.existintag )
+		  #if( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+	            if ("${prop.name}".equals(name)) {
+	                    return new ${prop.name}Mapper(attribute);
+	            }
+
+		  #end
+		 #end
+		#end
+	        }
+			return null;
+		}
+
+	}
+
+#foreach($prop in $component.properties)
+#if( !$prop.existintag )
+
+  #if( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+	
+	static class ${prop.name}Mapper extends Metadata {
+
+		private static final Class[] SIGNATURE = new Class[] {${prop.methodargs}};
+
+		private final TagAttribute _action;
+		/**
+		 * @param attribute
+		 */
+		public ${prop.name}Mapper(TagAttribute attribute) {
+			_action = attribute;
+		}
+
+		/* (non-Javadoc)
+		 * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object)
+		 */
+		public void applyMetadata(FaceletContext ctx, Object instance) {
+            ((${component.simpleClassName}) instance)
+            .${prop.setterName}(new LegacyMethodBinding(this._action
+                    .getMethodExpression(ctx, null,
+                            SIGNATURE)));
+		}
+
+	}
+	#end
+ #end
+ #end
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+ <tlib-version>${taglib.tlibversion}</tlib-version>
+ <jsp-version>${taglib.jspversion}</jsp-version>
+#if(${taglib.shortname})
+ <short-name>${taglib.shortname}</short-name>
+#end
+ <uri>${taglib.uri}</uri>
+#if(${taglib.description})
+ <description>${taglib.description}</description>
+#end
+${taglib.includeContent}
+
+#foreach( $component in ${components})
+	#if($component.tag)
+ <tag>
+  <name>${component.tag.name}</name>
+  <tag-class>${component.tag.classname}</tag-class>
+  <body-content>${component.tag.bodyContent}</body-content>
+  #if(${component.tag.displayname})  
+	<display-name>${component.tag.xmlEncodedDisplayname}</display-name>
+  #elseif(${component.displayname})
+	<display-name>${component.xmlEncodedDisplayname}</display-name>
+  #end
+  #if(${component.tag.description})
+  <description>${component.tag.xmlEncodedDescription}</description>
+  #else
+  <description>${component.xmlEncodedDescription}</description>
+  #end
+  #foreach( $prop in ${component.properties} )
+	#if( !${prop.hidden} && !${prop.disabled} )
+  <attribute>
+   <name>${prop.name}</name>
+   #if(${prop.required})
+	<required>true</required>
+   #end
+   <rtexprvalue>false</rtexprvalue>
+   <description>${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#if( $prop.alias )
+  <attribute>
+   <name>${prop.alias}</name>
+   <rtexprvalue>false</rtexprvalue>
+   <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#end
+	#end
+  #end
+</tag>
+#end
+#end
+
+#foreach( $validator in ${validators})
+	#if($validator.tag)
+ <tag>
+  <name>${validator.tag.name}</name>
+  <tag-class>${validator.tag.classname}</tag-class>
+  <body-content>${validator.tag.bodyContent}</body-content>
+  #if(${validator.tag.displayname})  
+	<display-name>${validator.tag.xmlEncodedDisplayname}</display-name>
+  #elseif(${validator.displayname})
+	<display-name>${validator.xmlEncodedDisplayname}</display-name>
+  #end
+  #if(${validator.tag.description})
+  <description>${validator.tag.xmlEncodedDescription}</description>
+  #elseif(${validator.xmlEncodedDescription})
+  <description>${validator.xmlEncodedDescription}</description>
+  #end
+  #foreach( $prop in ${validator.properties} )
+	#if( !${prop.hidden} && !${prop.disabled} )
+  <attribute>
+   <name>${prop.name}</name>
+   #if(${prop.required})
+	<required>true</required>
+   #end
+   <rtexprvalue>false</rtexprvalue>
+   <description>${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#if( $prop.alias )
+  <attribute>
+   <name>${prop.alias}</name>
+   <rtexprvalue>false</rtexprvalue>
+   <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#end
+	#end
+  #end
+</tag>
+#end
+#end
+
+#foreach( $converter in ${converters})
+	#if($converter.tag)
+ <tag>
+  <name>${converter.tag.name}</name>
+  <tag-class>${converter.tag.classname}</tag-class>
+  <body-content>${converter.tag.bodyContent}</body-content>
+  #if(${converter.tag.displayname})  
+	<display-name>${converter.tag.xmlEncodedDisplayname}</display-name>
+  #elseif(${converter.displayname})
+	<display-name>${converter.xmlEncodedDisplayname}</display-name>
+  #end
+  #if(${converter.tag.description})
+  <description>${converter.tag.xmlEncodedDescription}</description>
+  #elseif(${converter.xmlEncodedDescription})
+  <description>${converter.xmlEncodedDescription}</description>
+  #end
+  #foreach( $prop in ${converter.properties} )
+	#if( !${prop.hidden} && !${prop.disabled} )
+  <attribute>
+   <name>${prop.name}</name>
+   #if(${prop.required})
+	<required>true</required>
+   #end
+   <rtexprvalue>false</rtexprvalue>
+   <description>${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#if( $prop.alias )
+  <attribute>
+   <name>${prop.alias}</name>
+   <rtexprvalue>false</rtexprvalue>
+   <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#end
+	#end
+  #end
+</tag>
+#end
+#end
+
+
+
+</taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,173 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import javax.faces.webapp.UIComponentTag;
+import ${component.classname};
+import javax.faces.application.Application;
+import javax.faces.el.ValueBinding;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
+import javax.servlet.jsp.tagext.Tag;
+import java.io.IOException;
+import java.util.Enumeration;
+
+
+
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:14 $
+ *
+ */
+public class $tag.test.simpleClassName extends $tag.test.superclassname {
+
+
+	private $tag.simpleClassName tag;
+
+  /**
+   *  Constructor to init default renderers 
+   */ 
+  public ${tag.test.simpleClassName} (String name){
+  	super(name);
+  }
+
+
+	public void setUp() throws Exception {
+		super.setUp();
+		tag = new ${tag.simpleClassName}();
+		tag.setParent(new UIComponentTag(){
+
+			public String getComponentType() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+
+			public String getRendererType() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			public int doStartTag() throws JspException {
+				// TODO Auto-generated method stub
+				return Tag.EVAL_BODY_INCLUDE;
+			}
+			
+			public int doEndTag() throws JspException {
+				// TODO Auto-generated method stub
+				return Tag.EVAL_BODY_INCLUDE;
+			}
+			
+		});
+		
+	}
+
+	public void tearDown() throws Exception {
+		super.tearDown();
+		tag = null;
+	}
+	
+	
+	public void testSetPropertiesUIComponent() {
+		${component.simpleClassName} component = new ${component.simpleClassName}();
+	// create binding		
+		Application application = null;
+		ValueBinding binding = null;
+
+	#foreach( $prop in $tag.properties )
+		#if($prop.el)
+			 application = facesContext.getApplication();
+		     binding = application.createValueBinding(component.getOnclick());
+    		 component.setValueBinding("${prop.name}", binding);
+				#if($prop.classname == "java.lang.String")
+				component.${prop.setterName}( " __$prop.name" );	
+				#elseif($prop.classname == "java.lang.Boolean")
+				component.${prop.setterName}( new Boolean(true) );
+				#end
+		#end
+		//tag.${prop.setterName}("__${prop.name}");
+	#end
+
+		tag.setProperties(component);
+
+/*
+	#foreach( $prop in $component.properties )
+	 #if( !$prop.existintag )
+		 #if(!$prop.el)
+			if(isValueReference(this._${prop.name})){
+				throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}")
+			}
+		 #end	
+		 #if($prop.name == "action")
+		 	
+			setActionProperty(component, tag._${prop.name});
+		 #elseif($prop.name == "actionListener")
+			setActionListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "converter")
+			setConverterProperty(component, this._${prop.name});
+		 #elseif($prop.name == "validator")
+			setValidatorProperty(component, this._${prop.name});
+		 #elseif($prop.name == "valueChangeListener")
+			setValueChangedListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "value")
+			setValueProperty(component, this._${prop.name});
+		 #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
+			setValueBinding(component, "${prop.name}",this._${prop.name});
+		 #elseif(${prop.simpleType})
+			// Simple type - ${prop.simpleClassName}
+			set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
+			set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif( $prop.classname == "java.lang.String")
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.classname == "java.lang.Object")
+			// TODO - handle object
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+			if(null != this._${prop.name}){
+             if (isValueReference(this._${prop.name}))
+             {
+                MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name},
+                                                                                new Class[]{${prop.methodargs}});
+                ((${component.simpleClassName})component).${prop.setterName}(mb);
+             }
+             else
+             {
+                getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name});
+             }
+			}
+		 #else
+			// TODO - setup properties for other cases.
+			// name ${prop.name} with type $prop.classname
+		 #end	
+	 #end	 
+	#end
+*/	
+	}
+	
+	public void testGetRendererType(){
+		assertNotNull(tag.getRendererType());
+	}
+	
+	public void testGetComponentType(){
+		assertNotNull(tag.getComponentType());
+	}
+	
+	
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,109 @@
+/**
+ * License Agreement.
+ *
+ * Ajax4jsf 1.1 - 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
+ */
+
+#if($component.packageName)
+package $component.packageName;
+#end
+
+#if($component.imports)
+
+// 
+// Imports
+//
+#foreach( $import in $component.imports )
+import $import;
+#end
+//
+//
+//
+
+#else
+import java.util.Iterator;
+import java.util.Collection;
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.ajax4jsf.framework.renderer.ComponentsVariableResolver;
+import org.ajax4jsf.framework.renderer.ComponentVariables;
+#end
+
+#if($component.fullBaseclass)
+import $component.fullBaseclass;
+#else
+import org.ajax4jsf.framework.renderer.RendererBase;
+#end
+
+#if($component.baseclassName)
+#set( $baseclassname = $component.baseclassName )
+#else
+#set( $baseclassname = "RendererBase" )
+#end
+
+
+/**
+ * Renderer for component class ${component.fullClassName}
+ */
+public class $component.className extends $baseclassname {
+
+	public $component.className () {
+		super();
+	}
+
+#if( $component.declarations )
+	// 
+	// Declarations
+	//
+#foreach( $declaration in $component.declarations )
+	$declaration
+#end
+	// 
+	// 
+	//
+#end
+
+
+	private String convertToString(Object obj ) {
+		return ( obj == null ? "" : obj.toString() );
+	}
+	private String convertToString(boolean b ) {
+		return String.valueOf(b);
+	}
+	private String convertToString(int b ) {
+		return b!=Integer.MIN_VALUE?String.valueOf(b):"";
+	}
+	private String convertToString(long b ) {
+		return b!=Long.MIN_VALUE?String.valueOf(b):"";
+	}
+	
+	/**
+	 * Get base component class, targetted for this renderer. Used for check arguments in decode/encode.
+	 * @return
+	 */
+	protected Class getComponentClass() {
+#if($component.componentClass)
+		return ${component.componentClass}.class;
+#else
+		return UIComponent.class;
+#end		
+	}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,10 @@
+	
+	public void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component ) throws IOException {
+		ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component);
+		doEncodeBegin(writer, context, (${component.componentClass})component, variables );
+	}		
+
+	public void doEncodeBegin(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables ) throws IOException {
+	    $body
+	}		
+	
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,16 @@
+
+    public void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+		ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component);
+		doEncodeChildren(writer, context, (${component.componentClass})component, variables );
+	}		
+
+    public void doEncodeChildren(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables) throws IOException {
+	    ${body}
+	}		
+
+	/* (non-Javadoc)
+	 * @see javax.faces.render.Renderer#getRendersChildren()
+	 */
+	public boolean getRendersChildren() {
+		return true;
+	}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,12 @@
+
+	public void doEncodeEnd(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables) throws IOException {
+	  ${body}
+	}		
+	
+	public void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+		ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component);
+		doEncodeEnd(writer, context, (${component.componentClass})component, variables );
+
+		ComponentsVariableResolver.removeVariables(this, component);
+	}		
+	

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,3 @@
+Collection com_$index = (Collection)$items;
+for (Iterator iter =  com_$index .iterator(); iter.hasNext();) {
+	variables.setVariable("$item", iter.next());
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,5 @@
+for ( 
+	variables.setVariable("$item", $from);
+	Integer.getInteger(variables.getVariable("$item").toString()).intValue() < Integer.getInteger($to).toString()).intValue();
+	variables.addValueToVariable("$item", new Integer(1) )
+	) {
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,32 @@
+writer.startElement("$htmlTag", component);
+#if($htmlAttributes)
+#foreach( $key in $htmlAttributes.keySet() )
+	#set ( $attr = $htmlAttributes.get($key) )
+	#if ( $attr.code  ) 
+	$attr.code
+	#else
+		#if ( $attr.value )
+getUtils().writeAttribute(writer, "$attr.name", $attr.value );
+		#end
+	#end
+#end
+#end
+#if($passThruAttributes)
+//
+// pass thru attributes
+//
+#set( $passThruLength = ${passThruAttributes.size()})
+getUtils().encodeAttributesFromArray(context,component,new String[] {
+#foreach( $attribute in $passThruAttributes )
+    "$attribute" #if( $velocityCount < $passThruLength ),
+	#end
+#end
+});
+//
+//
+//
+#end
+#if($htmlText)
+writer.write( convertToString($htmlText) );
+writer.flush();
+#end
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,2 @@
+if ( Boolean.valueOf( String.valueOf($if) ).booleanValue() ) {
+

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,48 @@
+private final InternetResource[] ${property} = {
+	#set ($count = 0)
+	#foreach($resource in $resourceKeys)
+		#if($count > 0)
+			,
+		#end
+		#set ($count = $count + 1)
+		${resource}
+	#end
+};
+
+private InternetResource[] ${property}All = null;
+
+${getterModifier} InternetResource[] ${propertyGetterName}() {
+	synchronized (this) {
+		if (${property}All == null) {
+			InternetResource[] rsrcs = super.${propertyGetterName}();
+			boolean ignoreSuper = rsrcs == null || rsrcs.length == 0;
+			boolean ignoreThis = ${property} == null || ${property}.length == 0;
+			
+			if (ignoreSuper) {
+				if (ignoreThis) {
+					${property}All = new InternetResource[0];	
+				} else {
+					${property}All = ${property};
+				}
+			} else {
+				if (ignoreThis) {
+					${property}All = rsrcs;
+				} else {
+					java.util.Set rsrcsSet = new java.util.LinkedHashSet();
+
+					for (int i = 0; i < rsrcs.length; i++ ) {
+						rsrcsSet.add(rsrcs[i]);
+					}
+
+					for (int i = 0; i < ${property}.length; i++ ) {
+						rsrcsSet.add(${property}[i]);
+					}
+
+					${property}All = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]);
+				}
+			}
+		}
+	}
+	
+	return ${property}All;
+}
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,5 @@
+#if ($variableName)
+variables.setVariable("$variableName", $function);
+#else
+$function;
+#end
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,12 @@
+#if(${$ELIndex} || ${$ELVar})
+#if(${$ELIndex})
+Integer indexChildren_$indexChildren =  (Integer)ComponentUtils.evaluateExpression(facesContext, "$ELIndex");
+if (null != indexChildren_$indexChildren ) {
+	UIComponent component_$indexChildren =  (UIComponent)component.getChildren().get(indexChildren_$indexChildren .intValue());
+	renderChild(context, component_$indexChildren );
+}
+#else
+	UIComponent component_$indexChildren =  (UIComponent)evaluateExpression( "$ELVar" );
+	renderChild(context, component_$indexChildren );
+#end
+#end
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1 @@
+renderChild(context, (UIComponent)$value );

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,4 @@
+UIComponent indexChildren_$index = component.getFacet("$FacetName");
+if (null != indexChildren_$index && indexChildren_$index .isRendered()) {
+	renderChild(context, indexChildren_$index);
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1 @@
+variables.setVariable("$variable", getResource( "$resourceURI" ).getUri(context, component) );

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1 @@
+variables.setVariable("$variable", $expression );
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/tags.bin
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/tags.bin
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,3 @@
+resource.loader = classpath,antfile
+classpath.resource.loader.class = org.ajax4jsf.templatecompiler.velocity.ClasspathTemplateLoader
+antfile.resource.loader.class = org.ajax4jsf.templatecompiler.velocity.AntFileResourceLoader

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,232 @@
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.component.StateHolder;
+
+/**
+ * Validator-Id ${validator.id}
+ * ${validator.xmlEncodedDescription}
+ */
+public class $validator.simpleClassName extends $validator.superclass #if(${validator.stateHolderRequired} && !${validator.superclassImplementsStateHolder})implements StateHolder#end
+{
+
+  public static final String VALIDATOR_ID = "${validator.id}";
+
+  /**
+   *  Default no-args contstructor
+   */ 
+  public $validator.simpleClassName ()
+  {
+  }
+
+// Validator properties fields
+#set( $fieldCounter = 0 )
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+  /**
+   * $prop.name
+   * ${prop.xmlEncodedDescription}
+   */
+#if($prop.simpleType)
+  private $prop.simpleClassName  _$prop.name = ${prop.defaultvalue};		
+  /**
+   * Flag indicated that $prop.name is set.
+   */
+  private boolean _${prop.name}Set = false;	
+#set( $fieldCounter = $fieldCounter+2)
+#else
+  private $prop.simpleClassName  _$prop.name = null; /* Default is ${prop.defaultvalue}*/
+#set( $fieldCounter = $fieldCounter+1)
+#end
+#end	 
+#end
+
+// Getters and setters
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}( $prop.simpleClassName  __$prop.name )
+  {
+    this._${prop.name} = __$prop.name;
+#if($prop.simpleType)
+	this._${prop.name}Set = true;
+#end
+  }
+
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Getter for $prop.name
+   * @return $prop.name value from local variable or value binding
+   */
+  public $prop.simpleClassName ${prop.getterName}()
+  {
+    ValueBinding vb = getValueBinding(_${prop.name});
+#if($prop.simpleType)
+    if(this._${prop.name}Set)
+    {
+	  return this._${prop.name};
+    }
+    if (vb != null) 
+    {
+      ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext());
+      if (null == value) 
+      {
+        return this._${prop.name};
+      }
+      //return (value.${prop.classname}Value());
+      } else 
+      {
+        return (this._${prop.name});
+      }
+    }
+#else
+    if (null != this._${prop.name}) 
+    {
+      return this._${prop.name};
+    }
+#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding"))
+    else if (null != vb)
+    {
+      return (${prop.simpleClassName})vb.getValue(getFacesContext());
+    }
+#end
+    else
+    {
+      return ${prop.defaultvalue};
+    }
+  }
+#end
+#if($prop.raw)
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Raw Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}Raw( $prop.simpleClassName  __$prop.name )
+  {
+    this._${prop.name} = __$prop.name;
+  }
+  /*
+   * ${prop.xmlEncodedDescription}
+   * Raw ( bypadd bindings ) Getter for $prop.name
+   * @return $prop.name value from local variable 
+   */
+  public $prop.simpleClassName ${prop.getterName}Raw()
+  {
+    return this._${prop.name};
+  }
+#end
+#end	 
+#end
+
+
+#if($validator.stateHolderRequired)
+	
+  // Save state
+  // ----------------------------------------------------- StateHolder Methods
+
+  private boolean _transient;
+#if(${validator.superclassImplementsStateHolder})
+#set($currentField=1)
+#set( $fieldCounter = $fieldCounter+1)
+#else
+#set($currentField=0)
+#end
+  public Object saveState(FacesContext context) {
+#if(${validator.superSaveStateMethodExists})
+    Object values[] = new Object[${fieldCounter}];
+    values[0] = super.saveState(context);
+#else
+    Object values[] = new Object[${fieldCounter}];
+#end
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+    values[${currentField}] = new ${prop.boxingClass}(_$prop.name);
+#set( $currentField = $currentField+1)
+    values[${currentField}] = Boolean.valueOf(_${prop.name}Set);	
+#set( $currentField = $currentField+1)
+#else
+#if(!${prop.attachedstate} )
+    values[${currentField}] = _$prop.name;
+#else
+    values[${currentField}] = saveAttachedState(context, _$prop.name );		
+#end
+#set( $currentField = $currentField+1)
+#end	
+#end	 
+#end
+    return values;
+  }
+   
+#if(${validator.superclassImplementsStateHolder})
+#set($currentField=1)
+#else
+#set($currentField=0)
+#end
+  public void restoreState(FacesContext context, Object state) {
+#if(${validator.superRestoreStateMethodExists})
+    Object values[] = (Object[]) state;
+    super.restoreState(context, values[0]);
+#else
+    Object values[] = (Object[]) state;
+#end
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+    _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value();
+#set( $currentField = $currentField+1)
+    _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue();	
+#set( $currentField = $currentField+1)
+#else
+#if( !${prop.attachedstate} )
+    _$prop.name = (${prop.simpleClassName})values[${currentField}] ;
+#else
+    _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] );		
+#end
+#set( $currentField = $currentField+1)
+#end
+	
+#end	 
+#end
+  }
+  
+#if(!$validator.superIsTransientMethodExists)
+  public boolean isTransient()
+  {
+    return _transient;
+  }
+#end
+
+#if(!$validator.superSetTransientMethodExists)
+  public void setTransient(boolean newTransientValue)
+  {
+    this._transient = newTransientValue;
+  }
+#end
+
+#end
+	
+
+// Utilites
+
+  private FacesContext getFacesContext()
+  {
+    return FacesContext.getCurrentInstance();
+  }
+  
+  private ValueBinding getValueBinding(String name)
+  {
+    return getFacesContext().getApplication().createValueBinding(name);
+  }
+
+}
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,96 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.validator.Validator;
+import org.apache.commons.beanutils.ConvertUtils;
+import javax.faces.context.FacesContext;
+import javax.servlet.jsp.JspException;
+import javax.faces.el.ValueBinding;
+import ${validator.classname};
+
+public class $tag.simpleClassName extends $tag.superclass {
+
+	//private String validatorId = "${validator.id}";
+	
+	
+// Fields
+#foreach( $prop in $validator.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.name
+   * ${prop.xmlEncodedDescription}
+   */
+  private String  _$prop.name = null;
+
+#end	 
+#end
+// Setters
+#foreach( $prop in $validator.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.description
+   * Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}( String  __${prop.name} )
+  {
+	this._${prop.name} = __${prop.name};
+  }
+	 
+#end
+#if( $prop.alias)
+  /* 
+   * ${prop.xmlEncodedDescription}
+   * Setter for alias of $prop.name as $prop.alias
+   * @param $prop.name - new value
+   */
+  public void set${prop.upperFirstChar($prop.alias)}( String  __${prop.alias} )
+  {
+    this.${prop.setterName}(__${prop.alias});
+  }
+#end
+#end
+
+  protected Validator createValidator() throws JspException
+  {
+    ${validator.simpleClassName} validator = new ${validator.simpleClassName}();
+    _setProperties(validator);
+    return validator;
+  }
+
+  // Support method to wire in properties
+  private void _setProperties(${validator.simpleClassName} validator) throws JspException 
+  {
+    FacesContext facesContext = FacesContext.getCurrentInstance();
+#foreach( $prop in $validator.properties )
+#if( !$prop.existintag )
+    if (_${prop.name} != null) 
+    {
+#if( ${prop.el} )
+      if (UIComponentTag.isValueReference(_${prop.name})) 
+      {
+        ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name});
+        validator.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext));
+      }
+#if (!${prop.elonly})
+      else
+      {
+        validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+      }
+#end
+    }
+#else
+    validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+#end
+#end
+#end
+  }
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,202 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+#if(${generator.key})
+
+import java.io.IOException;
+import javax.faces.FacesException;
+import org.ajax4jsf.framework.util.base64.Codec;
+#end
+
+/**
+ * Component-Type ${component.name}
+ * Component-Family ${component.family}
+  	#if(${component.renderer})
+ * Renderer-Type ${component.renderer.name}
+  	#end
+ * ${component.xmlEncodedDescription}
+ */
+ public class $component.simpleClassName extends $component.superclass {
+
+  public static final String COMPONENT_TYPE = "${component.name}";
+
+  /**
+   *  Constructor to init default renderers 
+   */ 
+  public $component.simpleClassName (){
+  	#if(${component.renderer})
+  	setRendererType("${component.renderer.name}");
+  	#end
+  }
+
+// Component properties fields
+#set( $fiedCounter = 1 )
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	/**
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	 #if($prop.simpleType)
+	 private $prop.simpleClassName  _$prop.name = ${prop.defaultvalue};		
+	/**
+	 * Flag indicated what $prop.name is set.
+	 */
+	 private boolean _${prop.name}Set = false;	
+	 #set( $fiedCounter = $fiedCounter+2)
+	 #else
+	 private $prop.simpleClassName  _$prop.name = null; /* Default is ${prop.defaultvalue}*/
+	 #set( $fiedCounter = $fiedCounter+1)
+	 #end
+#end	 
+#end
+
+// Getters-setters
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Setter for $prop.name
+	 * @param $prop.name - new value
+	 */
+	 public void ${prop.setterName}( $prop.simpleClassName  __$prop.name ){
+		this._${prop.name} = __$prop.name;
+	 #if($prop.simpleType)
+		this._${prop.name}Set = true;
+	 #end
+	 }
+
+
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Getter for $prop.name
+	 * @return $prop.name value from local variable or value bindings
+	 */
+	 public $prop.simpleClassName ${prop.getterName}(  ){
+	 #if($prop.simpleType)
+		 if(this._${prop.name}Set){
+			return this._${prop.name};
+		 }
+    	ValueBinding vb = getValueBinding("${prop.name}");
+    	if (vb != null) {
+    	    ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext());
+    	    if (null == value) {
+    			return this._${prop.name};
+    	    }
+    	    return (value.${prop.classname}Value());
+    	} else {
+    	    return (this._${prop.name});
+    	}
+	 #else
+        if (null != this._${prop.name})
+        {
+            return this._${prop.name};
+        #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding"))
+	    }
+        ValueBinding vb = getValueBinding("${prop.name}");
+        if (null != vb){
+            return (${prop.simpleClassName})vb.getValue(getFacesContext());
+		#end
+        } else {
+            return ${prop.defaultvalue};
+        }
+	 #end
+	 }
+	 #if($prop.raw)
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Raw Setter for $prop.name
+	 * @param $prop.name - new value
+	 */
+	 public void ${prop.setterName}Raw( $prop.simpleClassName  __$prop.name ){
+		this._${prop.name} = __$prop.name;
+	 }
+   /**
+	 * ${prop.xmlEncodedDescription}
+	 * Raw ( bypadd bindings ) Getter for $prop.name
+	 * @return $prop.name value from local variable 
+	 */
+	 public $prop.simpleClassName ${prop.getterName}Raw(  ){
+			return this._${prop.name};
+	 }
+	 #end
+ #end	 
+#end
+
+#if( ${component.family}  )
+// Component family.
+	public static final String COMPONENT_FAMILY = "${component.family}";
+
+	public String getFamily() {
+		return COMPONENT_FAMILY;
+	}
+#end
+
+// Save state
+// ----------------------------------------------------- StateHolder Methods
+
+
+    public Object saveState(FacesContext context) {
+        Object values[] = new Object[${fiedCounter}];
+        values[0] = super.saveState(context);
+#set($currentField = 1)
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	 #if($prop.simpleType)		
+       values[${currentField}] = new ${prop.boxingClass}(_$prop.name);
+	   #set( $currentField = $currentField+1)
+	   values[${currentField}] = Boolean.valueOf(_${prop.name}Set);	
+	   #set( $currentField = $currentField+1)
+	 #else
+	   #if(!${prop.attachedstate} )
+       values[${currentField}] = _$prop.name;
+	   #else
+       values[${currentField}] = saveAttachedState(context, _$prop.name );		
+	   #end
+	   #set( $currentField = $currentField+1)
+	 #end
+	
+ #end	 
+#end
+	  return values;
+   }
+   
+
+    public void restoreState(FacesContext context, Object state) {
+        Object values[] = (Object[]) state;
+        super.restoreState(context, values[0]);
+#set($currentField = 1)
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	 #if($prop.simpleType)		
+       _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value();
+	   #set( $currentField = $currentField+1)
+	   _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue();	
+	   #set( $currentField = $currentField+1)
+	 #else
+	   #if( !${prop.attachedstate} )
+       _$prop.name = (${prop.simpleClassName})values[${currentField}] ;
+	   #else
+       _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] );		
+	   #end
+	   #set( $currentField = $currentField+1)
+	 #end
+	
+ #end	 
+#end
+	
+		
+	}	
+// Utilites
+
+}
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,149 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import ${component.classname};
+
+public class $tag.simpleClassName extends $tag.superclass {
+
+// Fields
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	/*
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	 private String  _$prop.name = null;
+
+ #end	 
+#end
+// Setters
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	/*
+	 * $prop.name
+	 * ${prop.xmlEncodedDescription}
+	 */
+	/**
+	 * $prop.description
+	 * Setter for $prop.name
+	 * @param $prop.name - new value
+	 */
+	 public void ${prop.setterName}( String  __${prop.name} ){
+		this._${prop.name} = __${prop.name};
+     }
+	 
+ #end
+ #if( $prop.alias)
+	/**
+	 * ${prop.xmlEncodedDescription}
+	 * Setter for alias of $prop.name as $prop.alias
+	 * @param $prop.name - new value
+	 */
+	 public void set${prop.upperFirstChar($prop.alias)}( String  __${prop.alias} ){
+		this.${prop.setterName}(__${prop.alias});
+     }
+ #end
+#end 	 
+// Release
+
+    /* (non-Javadoc)
+     * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#release()
+     */
+    public void release()
+    {
+        // TODO Auto-generated method stub
+        super.release();
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+	    this._${prop.name} = null;
+ #end	 
+#end
+	}
+	
+    /* (non-Javadoc)
+     * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#setProperties(javax.faces.component.UIComponent)
+     */
+    protected void setProperties(UIComponent component)
+    {
+        // TODO Auto-generated method stub
+        super.setProperties(component);
+	
+#foreach( $prop in $component.properties )
+ #if( !$prop.existintag )
+		 #if(!$prop.el)
+			if(isValueReference(this._${prop.name})){
+				throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}")
+			}
+		 #end	
+		 #if($prop.name == "action")
+			setActionProperty(component, this._${prop.name});
+		 #elseif($prop.name == "actionListener")
+			setActionListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "converter")
+			setConverterProperty(component, this._${prop.name});
+		 #elseif($prop.name == "validator")
+			setValidatorProperty(component, this._${prop.name});
+		 #elseif($prop.name == "valueChangeListener")
+			setValueChangedListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "value")
+			setValueProperty(component, this._${prop.name});
+		 #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
+			setValueBinding(component, "${prop.name}",this._${prop.name});
+		 #elseif(${prop.simpleType})
+			// Simple type - ${prop.simpleClassName}
+			set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
+			set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif( $prop.classname == "java.lang.String")
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.classname == "java.lang.Object")
+			// TODO - handle object
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+			if(null != this._${prop.name}){
+             if (isValueReference(this._${prop.name}))
+             {
+                MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name},
+                                                                                new Class[]{${prop.methodargs}});
+                ((${component.simpleClassName})component).${prop.setterName}(mb);
+             }
+             else
+             {
+                getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name});
+             }
+			}
+		 #else
+			// TODO - setup properties for other cases.
+			// name ${prop.name} with type $prop.classname
+		 #end	
+ #end	 
+#end
+   }
+	
+	/* (non-Javadoc)
+	 * @see javax.faces.webapp.UIComponentTag#getComponentType()
+	 */
+	public String getComponentType() {
+		// TODO Auto-generated method stub
+		return "${component.name}";
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.faces.webapp.UIComponentTag#getRendererType()
+	 */
+	public String getRendererType() {
+		#if($renderer)
+		return "${renderer.name}";
+		#else
+		return null;
+		#end
+	}
+
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,159 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+import com.gargoylesoftware.htmlunit.Page;
+import javax.faces.component.UIForm;
+import javax.faces.component.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.component.UIViewRoot;
+
+import org.ajax4jsf.tests.MockValueBinding;
+
+//import ${component.classname};
+#if(${generator.key})
+
+import java.io.IOException;
+import javax.faces.FacesException;
+import org.ajax4jsf.framework.util.base64.Codec;
+#end
+
+public class $component.test.simpleClassName extends $component.test.superclassname {
+
+//  public static final String COMPONENT_TYPE = "${component.name}";
+
+
+#set( $fiedCounter = 1 )
+#foreach( $prop in $component.properties )
+ #if( !$prop.exist )
+	 #if($prop.simpleType)
+	 private boolean _${prop.name}Set = false;	
+	 #set( $fiedCounter = $fiedCounter+2)
+	 #else
+	 #set( $fiedCounter = $fiedCounter+1)
+	 #end
+#end	 
+#end
+  
+  private $component.simpleClassName component;
+  private UIForm form;
+//  private FacesContext context;
+
+  /**
+   *  Constructor to init default renderers 
+   */ 
+  public $component.test.simpleClassName (String name){
+  	super(name);
+  }
+
+	/*
+	* setup the tets
+	*/
+	public void setUp() throws Exception {
+		super.setUp();
+		component = new ${component.simpleClassName}();
+		form = new HtmlForm();
+		form.setId("form");
+		facesContext.getViewRoot().getChildren().add(form);
+		
+		component.setId("component");
+#foreach( $prop in $component.properties )
+	#if(!$prop.exist && $prop.name != "value")
+		#if($prop.classname == "java.lang.String")
+		component.${prop.setterName}( " __$prop.name" );	
+		#elseif($prop.classname == "java.lang.Boolean")
+		component.${prop.setterName}( new Boolean(true) );
+		#end
+	 #end
+#end
+		
+		form.getChildren().add(component);
+		
+	}
+
+	/*
+	* setup the tets
+	*/
+	public void tearDown() throws Exception{
+		super.tearDown();
+		component = null;
+		form = null;
+	}
+
+	public void testComponent() throws Exception {
+	  	#if(${component.renderer})
+			assertEquals("${component.renderer.name}", component.getRendererType());
+	  	#end
+/*		
+		HtmlPage renderedView = renderView();
+		assertNotNull(renderedView);
+    	System.out.println(renderedView.getWebResponse().getContentAsString());
+    	HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId());
+    	assertNotNull(element);
+*/    	
+//    	values[0] = component.saveState(facesContext);
+    	
+	}
+/*
+	public void testDefaultValues(){
+		
+	}
+*/
+	public void testContext(){
+		
+		Object state = component.saveState(facesContext);
+/*		
+    	UIViewRoot root = facesContext.getViewRoot();
+    	root.processDecodes(facesContext);
+    	root.processValidators(facesContext);
+    	root.processUpdates(facesContext);
+    	root.processApplication(facesContext);
+*/
+		testRestoreState(state);
+	}
+	
+	public void testGetters() {
+		${component.simpleClassName} component = new ${component.simpleClassName}();
+		
+#foreach( $prop in $component.properties )
+	#if(!$prop.exist && !$prop.elonly && !$prop.classname.startsWith("javax.faces."))
+		component.setValueBinding("${prop.name}", new MockValueBinding($testDataGenerator.getTestVeData(${prop}), ${testDataGenerator.getTestVeClass(${prop})}.class));
+		assertEquals($testDataGenerator.getTestData(${prop}), component.${prop.getterName}());
+		component.${prop.setterName}($testDataGenerator.getTestData1(${prop}) );
+		assertEquals($testDataGenerator.getTestData1(${prop}), component.${prop.getterName}());
+	 #end
+#end
+
+
+	}
+
+	private void testRestoreState(Object state){
+		${component.simpleClassName} restoredComponent = new ${component.simpleClassName}();
+		restoredComponent.restoreState(facesContext, state);
+		
+#foreach( $prop in $component.properties )
+	#if(!$prop.exist)
+		assertEquals(component.${prop.getterName}(), restoredComponent.${prop.getterName}());
+	 #end
+#end
+
+	}
+	
+	private void assertEquals(double d1, double d2) {
+		assertEquals(d1, d2, 0);
+	}
+	
+	private void assertEquals(float d1, float d2) {
+		assertEquals(d1, d2, 0);
+	}
+}
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,221 @@
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+ import javax.faces.context.FacesContext;
+ import javax.faces.el.ValueBinding;
+import javax.faces.component.StateHolder;
+ 
+ /**
+  * Converter-Id ${converter.id}
+  * ${converter.xmlEncodedDescription}
+  */
+ 
+public class $converter.simpleClassName extends $converter.superclass #if(${converter.stateHolderRequired} && !${converter.superclassImplementsStateHolder})implements StateHolder#end
+ {
+ 
+   public static final String CONVERTER_ID = "${converter.id}";
+
+   
+ 
+ // Conveter properties fields
+
+#set( $fieldCounter = 0 )
+ #foreach( $prop in $converter.properties )
+
+#if( !$prop.exist )
+   /**
+    * $prop.name
+    * ${prop.xmlEncodedDescription}
+    */
+
+#if($prop.simpleType)
+   private $prop.simpleClassName  _$prop.name = ${prop.defaultvalue};		
+   /**
+    * Flag indicated that $prop.name is set.
+    */
+   private boolean _${prop.name}Set = false;	
+#set( $fieldCounter = $fieldCounter+2)
+#else
+   private $prop.simpleClassName  _$prop.name = null; /* Default is ${prop.defaultvalue}*/
+#set( $fieldCounter = $fieldCounter+1)
+ #end
+#end	 
+#end
+ 
+ // Getters and setters
+ #foreach( $prop in $converter.properties )
+
+#if( !$prop.exist )
+   /**
+    * ${prop.xmlEncodedDescription}
+    * Setter for $prop.name
+	*/
+   public void ${prop.setterName}( $prop.simpleClassName  __$prop.name )
+   {
+     this._${prop.name} = __$prop.name;
+
+#if($prop.simpleType)
+ 	this._${prop.name}Set = true;
+
+#end
+   }
+ 
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Getter for $prop.name
+   * @return $prop.name value from local variable or value binding
+   */
+   public $prop.simpleClassName ${prop.getterName}()
+   {
+     ValueBinding vb = getValueBinding("${prop.name}");
+
+#if($prop.simpleType)
+     if(this._${prop.name}Set)
+     {
+ 	  return this._${prop.name};
+
+         return (this._${prop.name});
+       }
+     }
+
+#else
+     if (null != this._${prop.name}) 
+     {
+       return this._${prop.name};
+     }
+
+#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding"))
+     else if (null != vb)
+     {
+       return (${prop.simpleClassName})vb.getValue(getFacesContext());
+     }
+
+#end
+     else
+     {
+       return ${prop.defaultvalue};
+     }
+
+#end
+  }
+ 	#if($prop.raw)
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Raw Setter for $prop.name
+   * @param $prop.name - new value
+   */
+
+   {
+     return this._${prop.name};
+   }
+ #end
+#end	 
+#end
+ 
+#if($converter.stateHolderRequired)
+ 
+  // Save state
+  // ----------------------------------------------------- StateHolder Methods
+
+  private boolean _transient;
+
+#if(${converter.superclassImplementsStateHolder})
+#set($currentField=1)
+#set($fieldCounter = $fieldCounter+1)
+#else
+#set($currentField=0)
+#end
+   public Object saveState(FacesContext context) {
+
+#if(${converter.superSaveStateMethodExists})
+    Object values[] = new Object[${fieldCounter}];
+     values[0] = super.saveState(context);
+#else
+    Object values[] = new Object[${fieldCounter}];
+#end
+#foreach( $prop in $converter.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+     values[${currentField}] = new ${prop.boxingClass}(_$prop.name);
+#set( $currentField = $currentField+1)
+    values[${currentField}] = Boolean.valueOf(_${prop.name}Set);	
+#set( $currentField = $currentField+1)
+#else
+#if(!${prop.attachedstate} )
+     values[${currentField}] = _$prop.name;
+#else
+     values[${currentField}] = saveAttachedState(context, _$prop.name );		
+ #end
+
+#set( $currentField = $currentField+1)
+#end	
+#end	 
+#end
+	return values;
+   }
+    
+
+#if(${converter.superclassImplementsStateHolder})
+#set($currentField=1)
+#else
+#set($currentField=0)
+#end
+   public void restoreState(FacesContext context, Object state) {
+#if(${converter.superRestoreStateMethodExists})
+     Object values[] = (Object[]) state;
+     super.restoreState(context, values[0]);
+#else
+    Object values[] = (Object[]) state;
+#end
+#foreach( $prop in $converter.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+     _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value();
+#set( $currentField = $currentField+1)
+    _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue();	
+#set( $currentField = $currentField+1)
+#else
+#if( !${prop.attachedstate} )
+     _$prop.name = (${prop.simpleClassName})values[${currentField}] ;
+#else
+     _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] );		
+ #end
+#set( $currentField = $currentField+1)
+#end
+ 	
+#end	 
+#end
+  }
+  
+#if(!$converter.superIsTransientMethodExists)
+  public boolean isTransient()
+  {
+    return _transient;
+  }
+#end
+ 
+#if(!$converter.superSetTransientMethodExists)
+  public void setTransient(boolean newTransientValue)
+  {
+    this._transient = newTransientValue;
+  }
+#end
+
+#end
+	  
+  // Utilites
+
+  private FacesContext getFacesContext()
+  {
+    return FacesContext.getCurrentInstance();
+  }
+  
+  private ValueBinding getValueBinding(String name)
+  {
+    return getFacesContext().getApplication().createValueBinding(name);
+  }
+
+ }

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,95 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import javax.faces.convert.Converter;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import org.apache.commons.beanutils.ConvertUtils;
+import javax.servlet.jsp.JspException;
+import ${converter.classname};
+
+public class $tag.simpleClassName extends $tag.superclass 
+{
+
+// Fields
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.name
+   * ${prop.xmlEncodedDescription}
+   */
+  private String  _$prop.name = null;
+
+#end	 
+#end
+// Setters
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.description
+   * Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}(String  __${prop.name}) 
+  {
+    this._${prop.name} = __${prop.name};
+  }
+	 
+#end
+#if( $prop.alias)
+  /*
+   * ${prop.xmlEncodedDescription}
+   * Setter for alias of $prop.name as $prop.alias
+   * @param $prop.name - new value
+   */
+  public void set${prop.upperFirstChar($prop.alias)}(String  __${prop.alias}) 
+  {
+    this.${prop.setterName}(__${prop.alias});
+  }
+#end
+#end
+
+  protected Converter createConverter() throws JspException 
+  {
+    ${converter.simpleClassName} converter = new ${converter.simpleClassName}();
+    _setProperties(converter);
+    return converter;
+  }
+
+  // Support method to wire in attributes
+  private void _setProperties(${converter.simpleClassName} converter) throws JspException 
+  {
+    FacesContext facesContext = FacesContext.getCurrentInstance();
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+    if (_${prop.name} != null) 
+    {
+#if( ${prop.el} )
+      if (UIComponentTag.isValueReference(_${prop.name})) 
+      {
+        ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name});
+        converter.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext));
+      }
+#if (!${prop.elonly})
+      else
+      {
+        converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+      }
+#end
+    }
+#else
+    converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+#end
+#end
+#end
+  }
+
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE facelet-taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
+  <namespace>${taglib.uri}</namespace>
+
+${taglib.includeContent}
+
+#foreach( $component in ${components} )
+  #if($component.tag)
+  <tag>
+    <tag-name>${component.tag.name}</tag-name>
+    <component>
+	  <component-type>${component.name}</component-type>
+    #if(${component.renderer})
+	  <renderer-type>${component.renderer.name}</renderer-type>
+    #end
+    #if(${component.taghandler})
+      <handler-class>${component.taghandler.classname}</handler-class>
+    #end
+    </component>
+  </tag>
+  #end
+#end
+
+#foreach( $validator in ${validators})
+#if($validator.tag)
+  <tag>
+    <tag-name>${validator.tag.name}</tag-name>
+    <validator>
+      <validator-id>${validator.id}</validator-id>
+#if(${validator.taghandler})
+      <handler-class>${validator.taghandler.classname}</handler-class>
+#end
+    </validator>
+  </tag>
+#end
+#end
+
+#foreach( $converter in ${converters} )
+#if($converter.tag)
+  <tag>
+    <tag-name>${converter.tag.name}</tag-name>
+    <converter>
+      <converter-id>${converter.id}</converter-id>
+#if(${converter.taghandler})
+      <handler-class>${converter.taghandler.classname}</handler-class>
+#end
+    </converter>
+  </tag>
+#end
+#end
+
+
+#foreach( $listener in ${listeners})
+ <tag>
+  <tag-name>${listener.name}</tag-name>
+#if(${listener.taghandler})
+		    <handler-class>
+				${listener.taghandler.classname}
+			</handler-class>
+#end
+	
+ </tag>
+#end
+
+</facelet-taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+                              "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+	
+${facesConfig.includeContent}
+
+#foreach( $validator in ${validators})
+  <validator>
+	<validator-id>${validator.id}</validator-id>
+	<validator-class>${validator.classname}</validator-class>
+	#if(${validator.description})
+	<description>${validator.description}</description>
+	#end
+	#if(${validator.displayname})
+	<display-name>${validator.displayname}</display-name>
+	#end
+	#if(${validator.icon})
+	<icon>${validator.icon}</icon>
+	#end
+  </validator>
+#end
+
+#foreach( $converter in ${converters})
+  <converter>
+	#if(${converter.id})
+	<converter-id>${converter.id}</converter-id>
+	#end
+	#if(${converter.forclass})
+	<converter-for-class>${converter.forclass}</converter-for-class>
+	#end
+
+	<converter-class>${converter.classname}</converter-class>
+
+	#if(${converter.description})
+	<description>${converter.description}</description>
+	#end
+	#if(${converter.displayname})
+	<display-name>${converter.displayname}</display-name>
+	#end
+	#if(${converter.icon})
+	<icon>${converter.icon}</icon>
+	#end
+  </converter>
+#end
+
+
+
+#foreach( $component in ${components})
+#if( $component.generate )
+  <component>
+  #if(${component.description})  
+	<description>${component.xmlEncodedDescription}</description>
+  #end
+  #if(${component.displayname})  
+	<display-name>${component.xmlEncodedDisplayname}</display-name>
+  #end
+    <component-type>${component.name}</component-type>
+    <component-class>${component.classname}</component-class>
+    
+#foreach( $facet in $component.facets)
+	<facet>
+  #if(${facet.description})  
+	<description>${facet.xmlEncodedDescription}</description>
+  #end
+  #if(${facet.displayname})  
+	<display-name>${facet.xmlEncodedDisplayname}</display-name>
+  #end
+      <facet-name>${facet.name}</facet-name>
+    </facet>
+#end
+	#if(${component.renderer})
+    <component-extension>
+      <component-family>${component.family}</component-family>
+      <renderer-type>${component.renderer.name}</renderer-type>
+    </component-extension>
+    #end
+  </component>
+#end
+#end
+
+#foreach( $renderkit in $facesConfig.renderKits)
+  <render-kit>
+		#if(${renderkit.renderkitid})
+		<render-kit-id>${renderkit.renderkitid}</render-kit-id>
+		#if(${renderkit.renderkitclass})
+		<render-kit-class>${renderkit.renderkitclass}</render-kit-class>
+		#end
+		#end
+#foreach( $component in $components)
+	#if($component.renderer)
+		#set($rendererClass = $renderkit.rendererClass($component.renderer.classname) )
+		#if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}"))
+  		<renderer>
+			<component-family>${component.family}</component-family>
+			<renderer-type>
+				${component.renderer.name}
+			</renderer-type>
+			<renderer-class>
+				${rendererClass}
+			</renderer-class>
+		</renderer>
+		#end
+	#end
+#end
+  </render-kit>
+#end
+
+
+</faces-config>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,101 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import ${listener.componentclass};
+
+import java.io.IOException;
+
+import javax.faces.*;
+import javax.faces.el.*;
+
+import javax.el.*;
+
+import com.sun.facelets.*;
+import com.sun.facelets.el.*;
+import com.sun.facelets.tag.*;
+import com.sun.facelets.tag.jsf.*;
+
+public class $tag.simpleClassName extends TagHandler {
+
+	private Class listenerType;
+
+    private final TagAttribute type;
+
+    private final TagAttribute binding;
+
+	public ${tag.simpleClassName}(TagConfig config) {
+	    super(config);
+		this.binding = this.getAttribute("binding");
+        this.type = this.getAttribute("type");
+        if (type != null) {
+            if (!type.isLiteral()) {
+                throw new TagAttributeException(this.tag, this.type, "Must be literal");
+            }
+            try {
+                this.listenerType = Class.forName(type.getValue());
+            } catch (Exception e) {
+                throw new TagAttributeException(this.tag, this.type, e);
+            }
+        }
+  	}
+
+  	 public void apply(FaceletContext ctx, UIComponent parent)
+            throws IOException, FacesException, FaceletException, ELException {
+        if (parent instanceof $listener.componentclass) {
+            // only process if parent was just created
+            if (parent.getParent() == null) {
+                ${listener.componentclass} src = (${listener.componentclass}) parent;
+                ${listener.listenerclass} listener = null;
+                ValueExpression ve = null;
+                if (this.binding != null) {
+                    ve = this.binding.getValueExpression(ctx,
+                            ${listener.listenerclass}.class);
+                    listener = (${listener.listenerclass}) ve.getValue(ctx);
+                }
+                if (listener == null) {
+                    try {
+                        listener = (${listener.listenerclass}) listenerType.newInstance();
+                    } catch (Exception e) {
+                        throw new TagAttributeException(this.tag, this.type, e.getCause());
+                    }
+                    if (ve != null) {
+                        ve.setValue(ctx, ve);
+                    }
+                }
+				#foreach($prop in $listener.properties)
+				 #if( !$prop.existintag )
+					TagAttribute attribute;
+					#if( $prop.required )
+					attribute = getRequiredAttribute("${prop.name}");
+					#else
+					attribute = getAttribute("${prop.name}");
+					#end
+		            if (attribute != null) {
+						ValueBinding binding;
+		
+						binding = new LegacyValueBinding(
+							attribute.getValueExpression(ctx, 
+							${prop.classname}.class));
+					
+			            listener.${prop.setterName}(binding);
+					}
+				 #end
+				#end
+
+                src.${listener.methodname}(listener);
+            }
+        } else {
+            throw new TagException(this.tag,
+                    "Parent is not of type ${listener.componentclass}, type is: " + parent);
+        }
+    }
+  	
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,25 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${package};
+
+import ${component.classname};
+import ${renderer.superclass};
+
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:49 $
+ *
+ */
+public class ${renderer.simpleClassName} extends ${renderer.superclass} {
+
+   /** 
+	 * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
+	 */
+	protected Class getComponentClass() {
+		// Expected component class for rendering
+		return ${component.simpleClassName}.class;
+	}
+
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+<!-- Include manual created resource -->
+${resourcesConfig.includeContent}
+
+#foreach( $key in ${classResources.keySet()})
+	<resource class="${classResources.get($key)}">
+		<name>${key}</name>
+	</resource>
+#end
+
+#foreach( $key in ${pathResources.keySet()})
+	<resource>
+		<name>${key}</name>
+		<path>${pathResources.get($key)}</path>
+	</resource>
+#end
+</resource-config>

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,102 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import ${component.classname};
+import com.sun.facelets.tag.jsf.ComponentHandler;
+import com.sun.facelets.tag.jsf.ComponentConfig;
+
+import com.sun.facelets.*;
+import com.sun.facelets.el.*;
+import com.sun.facelets.tag.*;
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:51 $
+ *
+ */
+public class $tag.simpleClassName extends $tag.superclass {
+
+
+  private static final ${tag.simpleClassName}MetaRule metaRule = new ${tag.simpleClassName}MetaRule();
+
+
+  
+  public ${tag.simpleClassName}(ComponentConfig config) 
+  {
+    super(config);
+  }
+// Metarule
+  protected MetaRuleset createMetaRuleset(Class type)
+  {
+    MetaRuleset m = super.createMetaRuleset(type);
+	m.addRule(metaRule);
+	return m;
+  }
+
+  	/**
+	 * @author shura (latest modification by $Author: alexsmirnov $)
+	 * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:51 $
+	 *
+	 */
+	static class ${tag.simpleClassName}MetaRule extends MetaRule{
+
+		/* (non-Javadoc)
+		 * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, com.sun.facelets.tag.TagAttribute, com.sun.facelets.tag.MetadataTarget)
+		 */
+		public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
+	        if (meta.isTargetInstanceOf(${component.simpleClassName}.class)) {
+		#foreach($prop in $component.properties)
+		 #if( !$prop.existintag )
+		  #if( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+	            if ("${prop.name}".equals(name)) {
+	                    return new ${prop.name}Mapper(attribute);
+	            }
+
+		  #end
+		 #end
+		#end
+	        }
+			return null;
+		}
+
+	}
+
+#foreach($prop in $component.properties)
+#if( !$prop.existintag )
+
+  #if( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+	
+	static class ${prop.name}Mapper extends Metadata {
+
+		private static final Class[] SIGNATURE = new Class[] {${prop.methodargs}};
+
+		private final TagAttribute _action;
+		/**
+		 * @param attribute
+		 */
+		public ${prop.name}Mapper(TagAttribute attribute) {
+			_action = attribute;
+		}
+
+		/* (non-Javadoc)
+		 * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object)
+		 */
+		public void applyMetadata(FaceletContext ctx, Object instance) {
+            ((${component.simpleClassName}) instance)
+            .${prop.setterName}(new LegacyMethodBinding(this._action
+                    .getMethodExpression(ctx, null,
+                            SIGNATURE)));
+		}
+
+	}
+	#end
+ #end
+ #end
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+ <tlib-version>${taglib.tlibversion}</tlib-version>
+ <jsp-version>${taglib.jspversion}</jsp-version>
+#if(${taglib.shortname})
+ <short-name>${taglib.shortname}</short-name>
+#end
+ <uri>${taglib.uri}</uri>
+#if(${taglib.description})
+ <description>${taglib.description}</description>
+#end
+${taglib.includeContent}
+
+#foreach( $component in ${components})
+	#if($component.tag)
+ <tag>
+  <name>${component.tag.name}</name>
+  <tag-class>${component.tag.classname}</tag-class>
+  <body-content>${component.tag.bodyContent}</body-content>
+  #if(${component.tag.displayname})  
+	<display-name>${component.tag.xmlEncodedDisplayname}</display-name>
+  #elseif(${component.displayname})
+	<display-name>${component.xmlEncodedDisplayname}</display-name>
+  #end
+  #if(${component.tag.description})
+  <description>${component.tag.xmlEncodedDescription}</description>
+  #else
+  <description>${component.xmlEncodedDescription}</description>
+  #end
+  #foreach( $prop in ${component.properties} )
+	#if( !${prop.hidden} && !${prop.disabled} )
+  <attribute>
+   <name>${prop.name}</name>
+   #if(${prop.required})
+	<required>true</required>
+   #end
+   <rtexprvalue>false</rtexprvalue>
+   <description>${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#if( $prop.alias )
+  <attribute>
+   <name>${prop.alias}</name>
+   <rtexprvalue>false</rtexprvalue>
+   <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#end
+	#end
+  #end
+</tag>
+#end
+#end
+
+#foreach( $validator in ${validators})
+	#if($validator.tag)
+ <tag>
+  <name>${validator.tag.name}</name>
+  <tag-class>${validator.tag.classname}</tag-class>
+  <body-content>${validator.tag.bodyContent}</body-content>
+  #if(${validator.tag.displayname})  
+	<display-name>${validator.tag.xmlEncodedDisplayname}</display-name>
+  #elseif(${validator.displayname})
+	<display-name>${validator.xmlEncodedDisplayname}</display-name>
+  #end
+  #if(${validator.tag.description})
+  <description>${validator.tag.xmlEncodedDescription}</description>
+  #elseif(${validator.xmlEncodedDescription})
+  <description>${validator.xmlEncodedDescription}</description>
+  #end
+  #foreach( $prop in ${validator.properties} )
+	#if( !${prop.hidden} && !${prop.disabled} )
+  <attribute>
+   <name>${prop.name}</name>
+   #if(${prop.required})
+	<required>true</required>
+   #end
+   <rtexprvalue>false</rtexprvalue>
+   <description>${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#if( $prop.alias )
+  <attribute>
+   <name>${prop.alias}</name>
+   <rtexprvalue>false</rtexprvalue>
+   <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#end
+	#end
+  #end
+</tag>
+#end
+#end
+
+#foreach( $converter in ${converters})
+	#if($converter.tag)
+ <tag>
+  <name>${converter.tag.name}</name>
+  <tag-class>${converter.tag.classname}</tag-class>
+  <body-content>${converter.tag.bodyContent}</body-content>
+  #if(${converter.tag.displayname})  
+	<display-name>${converter.tag.xmlEncodedDisplayname}</display-name>
+  #elseif(${converter.displayname})
+	<display-name>${converter.xmlEncodedDisplayname}</display-name>
+  #end
+  #if(${converter.tag.description})
+  <description>${converter.tag.xmlEncodedDescription}</description>
+  #elseif(${converter.xmlEncodedDescription})
+  <description>${converter.xmlEncodedDescription}</description>
+  #end
+  #foreach( $prop in ${converter.properties} )
+	#if( !${prop.hidden} && !${prop.disabled} )
+  <attribute>
+   <name>${prop.name}</name>
+   #if(${prop.required})
+	<required>true</required>
+   #end
+   <rtexprvalue>false</rtexprvalue>
+   <description>${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#if( $prop.alias )
+  <attribute>
+   <name>${prop.alias}</name>
+   <rtexprvalue>false</rtexprvalue>
+   <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description>
+  </attribute>
+	#end
+	#end
+  #end
+</tag>
+#end
+#end
+
+
+
+</taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,173 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import javax.faces.webapp.UIComponentTag;
+import ${component.classname};
+import javax.faces.application.Application;
+import javax.faces.el.ValueBinding;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
+import javax.servlet.jsp.tagext.Tag;
+import java.io.IOException;
+import java.util.Enumeration;
+
+
+
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:14 $
+ *
+ */
+public class $tag.test.simpleClassName extends $tag.test.superclassname {
+
+
+	private $tag.simpleClassName tag;
+
+  /**
+   *  Constructor to init default renderers 
+   */ 
+  public ${tag.test.simpleClassName} (String name){
+  	super(name);
+  }
+
+
+	public void setUp() throws Exception {
+		super.setUp();
+		tag = new ${tag.simpleClassName}();
+		tag.setParent(new UIComponentTag(){
+
+			public String getComponentType() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+
+			public String getRendererType() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			public int doStartTag() throws JspException {
+				// TODO Auto-generated method stub
+				return Tag.EVAL_BODY_INCLUDE;
+			}
+			
+			public int doEndTag() throws JspException {
+				// TODO Auto-generated method stub
+				return Tag.EVAL_BODY_INCLUDE;
+			}
+			
+		});
+		
+	}
+
+	public void tearDown() throws Exception {
+		super.tearDown();
+		tag = null;
+	}
+	
+	
+	public void testSetPropertiesUIComponent() {
+		${component.simpleClassName} component = new ${component.simpleClassName}();
+	// create binding		
+		Application application = null;
+		ValueBinding binding = null;
+
+	#foreach( $prop in $tag.properties )
+		#if($prop.el)
+			 application = facesContext.getApplication();
+		     binding = application.createValueBinding(component.getOnclick());
+    		 component.setValueBinding("${prop.name}", binding);
+				#if($prop.classname == "java.lang.String")
+				component.${prop.setterName}( " __$prop.name" );	
+				#elseif($prop.classname == "java.lang.Boolean")
+				component.${prop.setterName}( new Boolean(true) );
+				#end
+		#end
+		//tag.${prop.setterName}("__${prop.name}");
+	#end
+
+		tag.setProperties(component);
+
+/*
+	#foreach( $prop in $component.properties )
+	 #if( !$prop.existintag )
+		 #if(!$prop.el)
+			if(isValueReference(this._${prop.name})){
+				throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}")
+			}
+		 #end	
+		 #if($prop.name == "action")
+		 	
+			setActionProperty(component, tag._${prop.name});
+		 #elseif($prop.name == "actionListener")
+			setActionListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "converter")
+			setConverterProperty(component, this._${prop.name});
+		 #elseif($prop.name == "validator")
+			setValidatorProperty(component, this._${prop.name});
+		 #elseif($prop.name == "valueChangeListener")
+			setValueChangedListenerProperty(component, this._${prop.name});
+		 #elseif($prop.name == "value")
+			setValueProperty(component, this._${prop.name});
+		 #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
+			setValueBinding(component, "${prop.name}",this._${prop.name});
+		 #elseif(${prop.simpleType})
+			// Simple type - ${prop.simpleClassName}
+			set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
+			set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); 
+		 #elseif( $prop.classname == "java.lang.String")
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.classname == "java.lang.Object")
+			// TODO - handle object
+			setStringProperty(component, "${prop.name}",this._${prop.name});
+		 #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") )
+			if(null != this._${prop.name}){
+             if (isValueReference(this._${prop.name}))
+             {
+                MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name},
+                                                                                new Class[]{${prop.methodargs}});
+                ((${component.simpleClassName})component).${prop.setterName}(mb);
+             }
+             else
+             {
+                getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name});
+             }
+			}
+		 #else
+			// TODO - setup properties for other cases.
+			// name ${prop.name} with type $prop.classname
+		 #end	
+	 #end	 
+	#end
+*/	
+	}
+	
+	public void testGetRendererType(){
+		assertNotNull(tag.getRendererType());
+	}
+	
+	public void testGetComponentType(){
+		assertNotNull(tag.getComponentType());
+	}
+	
+	
+}

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,232 @@
+package $package;
+
+#foreach($import in $imports)
+import $import ;
+#end
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.component.StateHolder;
+
+/**
+ * Validator-Id ${validator.id}
+ * ${validator.xmlEncodedDescription}
+ */
+public class $validator.simpleClassName extends $validator.superclass #if(${validator.stateHolderRequired} && !${validator.superclassImplementsStateHolder})implements StateHolder#end
+{
+
+  public static final String VALIDATOR_ID = "${validator.id}";
+
+  /**
+   *  Default no-args contstructor
+   */ 
+  public $validator.simpleClassName ()
+  {
+  }
+
+// Validator properties fields
+#set( $fieldCounter = 0 )
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+  /**
+   * $prop.name
+   * ${prop.xmlEncodedDescription}
+   */
+#if($prop.simpleType)
+  private $prop.simpleClassName  _$prop.name = ${prop.defaultvalue};		
+  /**
+   * Flag indicated that $prop.name is set.
+   */
+  private boolean _${prop.name}Set = false;	
+#set( $fieldCounter = $fieldCounter+2)
+#else
+  private $prop.simpleClassName  _$prop.name = null; /* Default is ${prop.defaultvalue}*/
+#set( $fieldCounter = $fieldCounter+1)
+#end
+#end	 
+#end
+
+// Getters and setters
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}( $prop.simpleClassName  __$prop.name )
+  {
+    this._${prop.name} = __$prop.name;
+#if($prop.simpleType)
+	this._${prop.name}Set = true;
+#end
+  }
+
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Getter for $prop.name
+   * @return $prop.name value from local variable or value binding
+   */
+  public $prop.simpleClassName ${prop.getterName}()
+  {
+    ValueBinding vb = getValueBinding(_${prop.name});
+#if($prop.simpleType)
+    if(this._${prop.name}Set)
+    {
+	  return this._${prop.name};
+    }
+    if (vb != null) 
+    {
+      ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext());
+      if (null == value) 
+      {
+        return this._${prop.name};
+      }
+      //return (value.${prop.classname}Value());
+      } else 
+      {
+        return (this._${prop.name});
+      }
+    }
+#else
+    if (null != this._${prop.name}) 
+    {
+      return this._${prop.name};
+    }
+#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding"))
+    else if (null != vb)
+    {
+      return (${prop.simpleClassName})vb.getValue(getFacesContext());
+    }
+#end
+    else
+    {
+      return ${prop.defaultvalue};
+    }
+  }
+#end
+#if($prop.raw)
+  /**
+   * ${prop.xmlEncodedDescription}
+   * Raw Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}Raw( $prop.simpleClassName  __$prop.name )
+  {
+    this._${prop.name} = __$prop.name;
+  }
+  /*
+   * ${prop.xmlEncodedDescription}
+   * Raw ( bypadd bindings ) Getter for $prop.name
+   * @return $prop.name value from local variable 
+   */
+  public $prop.simpleClassName ${prop.getterName}Raw()
+  {
+    return this._${prop.name};
+  }
+#end
+#end	 
+#end
+
+
+#if($validator.stateHolderRequired)
+	
+  // Save state
+  // ----------------------------------------------------- StateHolder Methods
+
+  private boolean _transient;
+#if(${validator.superclassImplementsStateHolder})
+#set($currentField=1)
+#set( $fieldCounter = $fieldCounter+1)
+#else
+#set($currentField=0)
+#end
+  public Object saveState(FacesContext context) {
+#if(${validator.superSaveStateMethodExists})
+    Object values[] = new Object[${fieldCounter}];
+    values[0] = super.saveState(context);
+#else
+    Object values[] = new Object[${fieldCounter}];
+#end
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+    values[${currentField}] = new ${prop.boxingClass}(_$prop.name);
+#set( $currentField = $currentField+1)
+    values[${currentField}] = Boolean.valueOf(_${prop.name}Set);	
+#set( $currentField = $currentField+1)
+#else
+#if(!${prop.attachedstate} )
+    values[${currentField}] = _$prop.name;
+#else
+    values[${currentField}] = saveAttachedState(context, _$prop.name );		
+#end
+#set( $currentField = $currentField+1)
+#end	
+#end	 
+#end
+    return values;
+  }
+   
+#if(${validator.superclassImplementsStateHolder})
+#set($currentField=1)
+#else
+#set($currentField=0)
+#end
+  public void restoreState(FacesContext context, Object state) {
+#if(${validator.superRestoreStateMethodExists})
+    Object values[] = (Object[]) state;
+    super.restoreState(context, values[0]);
+#else
+    Object values[] = (Object[]) state;
+#end
+#foreach( $prop in $validator.properties )
+#if( !$prop.exist )
+#if($prop.simpleType)		
+    _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value();
+#set( $currentField = $currentField+1)
+    _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue();	
+#set( $currentField = $currentField+1)
+#else
+#if( !${prop.attachedstate} )
+    _$prop.name = (${prop.simpleClassName})values[${currentField}] ;
+#else
+    _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] );		
+#end
+#set( $currentField = $currentField+1)
+#end
+	
+#end	 
+#end
+  }
+  
+#if(!$validator.superIsTransientMethodExists)
+  public boolean isTransient()
+  {
+    return _transient;
+  }
+#end
+
+#if(!$validator.superSetTransientMethodExists)
+  public void setTransient(boolean newTransientValue)
+  {
+    this._transient = newTransientValue;
+  }
+#end
+
+#end
+	
+
+// Utilites
+
+  private FacesContext getFacesContext()
+  {
+    return FacesContext.getCurrentInstance();
+  }
+  
+  private ValueBinding getValueBinding(String name)
+  {
+    return getFacesContext().getApplication().createValueBinding(name);
+  }
+
+}
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,93 @@
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.validator.Validator;
+import org.apache.commons.beanutils.ConvertUtils;
+import javax.faces.context.FacesContext;
+import javax.servlet.jsp.JspException;
+import javax.faces.el.ValueBinding;
+import ${validator.classname};
+
+public class $tag.simpleClassName extends $tag.superclass {
+
+// Fields
+#foreach( $prop in $validator.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.name
+   * ${prop.xmlEncodedDescription}
+   */
+  private String  _$prop.name = null;
+
+#end	 
+#end
+// Setters
+#foreach( $prop in $validator.properties )
+#if( !$prop.existintag )
+  /*
+   * $prop.description
+   * Setter for $prop.name
+   * @param $prop.name - new value
+   */
+  public void ${prop.setterName}( String  __${prop.name} )
+  {
+	this._${prop.name} = __${prop.name};
+  }
+	 
+#end
+#if( $prop.alias)
+  /* 
+   * ${prop.xmlEncodedDescription}
+   * Setter for alias of $prop.name as $prop.alias
+   * @param $prop.name - new value
+   */
+  public void set${prop.upperFirstChar($prop.alias)}( String  __${prop.alias} )
+  {
+    this.${prop.setterName}(__${prop.alias});
+  }
+#end
+#end
+
+  protected Validator createValidator() throws JspException
+  {
+    ${validator.simpleClassName} validator = new ${validator.simpleClassName}();
+    _setProperties(validator);
+    return validator;
+  }
+
+  // Support method to wire in properties
+  private void _setProperties(${validator.simpleClassName} validator) throws JspException 
+  {
+    FacesContext facesContext = FacesContext.getCurrentInstance();
+#foreach( $prop in $validator.properties )
+#if( !$prop.existintag )
+    if (_${prop.name} != null) 
+    {
+#if( ${prop.el} )
+      if (UIComponentTag.isValueReference(_${prop.name})) 
+      {
+        ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name});
+        validator.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext));
+      }
+#if (!${prop.elonly})
+      else
+      {
+        validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+      }
+#end
+    }
+#else
+    validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+#end
+#end
+#end
+  }
+}

Added: branches/refactor1/cdk/generator/target/classes/VM_global_library.vm
===================================================================
--- branches/refactor1/cdk/generator/target/classes/VM_global_library.vm	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/VM_global_library.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,6 @@
+#macro( quietnull $a)
+#if($a)$a#end
+#end
+
+
+

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/AntLogger.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/AntLogger.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/JSFGeneratorTask.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/JSFGeneratorTask.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/VCPVersionTask.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/VCPVersionTask.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties
===================================================================
--- branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,3 @@
+resource.loader classpath,antfile
+classpath.resource.loader.class org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+antfile.resource.loader.class org.ajax4jsf.builder.velocity.AntFileResourceLoader

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig$1.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig$1.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBaseBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBaseBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ConverterBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ConverterBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/EventBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/EventBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/JsfBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/JsfBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ListenerBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ListenerBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/LoaderHolder.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/LoaderHolder.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ParsingException.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ParsingException.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/PropertyBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/PropertyBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/RendererBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/RendererBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagHandlerBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagHandlerBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TestClassHolder.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TestClassHolder.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ValidatorBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ValidatorBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder$1.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder$1.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/BlankRendererGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/BlankRendererGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet$PatternEntry.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet$PatternEntry.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTagGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTagGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTestGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTestGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterTagGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterTagGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FaceletsTaglibGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FaceletsTaglibGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FacesConfigGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FacesConfigGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GeneratorException.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GeneratorException.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GetResourceInterceptor.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GetResourceInterceptor.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/InnerGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/InnerGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/JSFGeneratorConfiguration.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/JSFGeneratorConfiguration.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ListenerGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ListenerGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/Logger.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/Logger.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RenderKitBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RenderKitBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererCompilationContext.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererCompilationContext.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagHandlerGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagHandlerGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagTestGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagTestGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TaglibGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TaglibGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TestDataGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TestDataGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorTagGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorTagGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/XMLConfigGenerator.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/XMLConfigGenerator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/AntFileResourceLoader.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/AntFileResourceLoader.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/BuilderContext.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/BuilderContext.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/ClasspathTemplateLoader.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/ClasspathTemplateLoader.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/ArrayNodeList.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/ArrayNodeList.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody$1.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody$1.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties
===================================================================
--- branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,3 @@
+resource.loader classpath,antfile
+classpath.resource.loader.class org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+antfile.resource.loader.class org.ajax4jsf.templatecompiler.velocity.AntFileResourceLoader

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationContext.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationContext.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationException.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationException.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/StringUtils.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/StringUtils.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/Variable.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/Variable.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL$containedClass.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL$containedClass.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELCompiler.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELCompiler.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELParser.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELParser.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ICompiledEL.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ICompiledEL.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/IELCompiler.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/IELCompiler.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/Attribute.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/Attribute.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/BodyElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/BodyElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/DeclarationElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/DeclarationElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsArray.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsArray.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsFactory.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsFactory.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/RootElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/RootElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CommentElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CommentElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/PIElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/PIElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/TextElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/TextElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Expression.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Expression.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/CallbackListener.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/CallbackListener.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/BuilderContext.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/BuilderContext.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/generator-3.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/generator-3.1.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml
===================================================================
--- branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.ajax4jsf.AppTest">
+  <properties>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386"/>
+    <property name="java.vm.version" value="1.6.0_01-b06"/>
+    <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.vendor.url" value="http://java.sun.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="user.country" value="US"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/>
+    <property name="java.runtime.version" value="1.6.0_01-b06"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+    <property name="basedir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/>
+    <property name="java.endorsed.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/endorsed"/>
+    <property name="os.arch" value="i386"/>
+    <property name="java.io.tmpdir" value="/tmp"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="os.name" value="Linux"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386/server:/usr/local/jdk1.6.0_01/jre/lib/i386:/usr/local/jdk1.6.0_01/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="sun.management.compiler" value="HotSpot Server Compiler"/>
+    <property name="os.version" value="2.6.21-1.3228.fc7"/>
+    <property name="user.home" value="/home/asmirnov"/>
+    <property name="user.timezone" value=""/>
+    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.specification.version" value="1.6"/>
+    <property name="user.name" value="asmirnov"/>
+    <property name="java.class.path" value="/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-api/2.3/surefire-api-2.3.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar:/home/asmirnov/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-booter/2.3/surefire-booter-2.3.jar:/home/asmirnov/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/home/asmirnov/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.arch.data.model" value="32"/>
+    <property name="java.home" value="/usr/local/jdk1.6.0_01/jre"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="user.language" value="en"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.6.0_01"/>
+    <property name="java.ext.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/ext:/usr/java/packages/lib/ext"/>
+    <property name="sun.boot.class.path" value="/usr/local/jdk1.6.0_01/jre/lib/resources.jar:/usr/local/jdk1.6.0_01/jre/lib/rt.jar:/usr/local/jdk1.6.0_01/jre/lib/sunrsasign.jar:/usr/local/jdk1.6.0_01/jre/lib/jsse.jar:/usr/local/jdk1.6.0_01/jre/lib/jce.jar:/usr/local/jdk1.6.0_01/jre/lib/charsets.jar:/usr/local/jdk1.6.0_01/jre/classes"/>
+    <property name="java.vendor" value="Sun Microsystems Inc."/>
+    <property name="localRepository" value="/home/asmirnov/.m2/repository"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="sun.desktop" value="gnome"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+  <testcase time="0" name="testApp"/>
+</testsuite>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml
===================================================================
--- branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.009" errors="0" skipped="0" tests="9" name="org.ajax4jsf.builder.generator.ClassPatternSetTest">
+  <properties>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386"/>
+    <property name="java.vm.version" value="1.6.0_01-b06"/>
+    <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.vendor.url" value="http://java.sun.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="user.country" value="US"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/>
+    <property name="java.runtime.version" value="1.6.0_01-b06"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+    <property name="basedir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/>
+    <property name="java.endorsed.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/endorsed"/>
+    <property name="os.arch" value="i386"/>
+    <property name="java.io.tmpdir" value="/tmp"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="os.name" value="Linux"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386/server:/usr/local/jdk1.6.0_01/jre/lib/i386:/usr/local/jdk1.6.0_01/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="sun.management.compiler" value="HotSpot Server Compiler"/>
+    <property name="os.version" value="2.6.21-1.3228.fc7"/>
+    <property name="user.home" value="/home/asmirnov"/>
+    <property name="user.timezone" value=""/>
+    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.specification.version" value="1.6"/>
+    <property name="user.name" value="asmirnov"/>
+    <property name="java.class.path" value="/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-api/2.3/surefire-api-2.3.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar:/home/asmirnov/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-booter/2.3/surefire-booter-2.3.jar:/home/asmirnov/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/home/asmirnov/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.arch.data.model" value="32"/>
+    <property name="java.home" value="/usr/local/jdk1.6.0_01/jre"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="user.language" value="en"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.6.0_01"/>
+    <property name="java.ext.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/ext:/usr/java/packages/lib/ext"/>
+    <property name="sun.boot.class.path" value="/usr/local/jdk1.6.0_01/jre/lib/resources.jar:/usr/local/jdk1.6.0_01/jre/lib/rt.jar:/usr/local/jdk1.6.0_01/jre/lib/sunrsasign.jar:/usr/local/jdk1.6.0_01/jre/lib/jsse.jar:/usr/local/jdk1.6.0_01/jre/lib/jce.jar:/usr/local/jdk1.6.0_01/jre/lib/charsets.jar:/usr/local/jdk1.6.0_01/jre/classes"/>
+    <property name="java.vendor" value="Sun Microsystems Inc."/>
+    <property name="localRepository" value="/home/asmirnov/.m2/repository"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="sun.desktop" value="gnome"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+  <testcase time="0.003" name="testSetExcludes"/>
+  <testcase time="0" name="testSetExcludes1"/>
+  <testcase time="0" name="testSetIncludes"/>
+  <testcase time="0" name="testMatchClassExclude"/>
+  <testcase time="0" name="testMatchClassInclude"/>
+  <testcase time="0.001" name="testMatchClassIncExclude"/>
+  <testcase time="0" name="testMatchPath"/>
+  <testcase time="0" name="testMatch"/>
+  <testcase time="0" name="testTokenizePathAsArray"/>
+</testsuite>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml
===================================================================
--- branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.322" errors="0" skipped="0" tests="7" name="org.ajax4jsf.builder.xml.XMLBodyTest">
+  <properties>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386"/>
+    <property name="java.vm.version" value="1.6.0_01-b06"/>
+    <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.vendor.url" value="http://java.sun.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="user.country" value="US"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/>
+    <property name="java.runtime.version" value="1.6.0_01-b06"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+    <property name="basedir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/>
+    <property name="java.endorsed.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/endorsed"/>
+    <property name="os.arch" value="i386"/>
+    <property name="java.io.tmpdir" value="/tmp"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="os.name" value="Linux"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386/server:/usr/local/jdk1.6.0_01/jre/lib/i386:/usr/local/jdk1.6.0_01/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="sun.management.compiler" value="HotSpot Server Compiler"/>
+    <property name="os.version" value="2.6.21-1.3228.fc7"/>
+    <property name="user.home" value="/home/asmirnov"/>
+    <property name="user.timezone" value=""/>
+    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.specification.version" value="1.6"/>
+    <property name="user.name" value="asmirnov"/>
+    <property name="java.class.path" value="/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-api/2.3/surefire-api-2.3.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar:/home/asmirnov/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-booter/2.3/surefire-booter-2.3.jar:/home/asmirnov/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/home/asmirnov/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.arch.data.model" value="32"/>
+    <property name="java.home" value="/usr/local/jdk1.6.0_01/jre"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="user.language" value="en"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.6.0_01"/>
+    <property name="java.ext.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/ext:/usr/java/packages/lib/ext"/>
+    <property name="sun.boot.class.path" value="/usr/local/jdk1.6.0_01/jre/lib/resources.jar:/usr/local/jdk1.6.0_01/jre/lib/rt.jar:/usr/local/jdk1.6.0_01/jre/lib/sunrsasign.jar:/usr/local/jdk1.6.0_01/jre/lib/jsse.jar:/usr/local/jdk1.6.0_01/jre/lib/jce.jar:/usr/local/jdk1.6.0_01/jre/lib/charsets.jar:/usr/local/jdk1.6.0_01/jre/classes"/>
+    <property name="java.vendor" value="Sun Microsystems Inc."/>
+    <property name="localRepository" value="/home/asmirnov/.m2/repository"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="sun.desktop" value="gnome"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+  <testcase time="0.072" name="testLoadXML"/>
+  <testcase time="0.002" name="testIsRootName"/>
+  <testcase time="0.002" name="testGetDoctype"/>
+  <testcase time="0.003" name="testGetRootNameSpace"/>
+  <testcase time="0.079" name="testGetContent"/>
+  <testcase time="0.109" name="testGetContentXpath"/>
+  <testcase time="0.01" name="testGetContentUnique"/>
+</testsuite>
\ No newline at end of file

Added: branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt
===================================================================
--- branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.ajax4jsf.AppTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec

Added: branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt
===================================================================
--- branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.ajax4jsf.builder.generator.ClassPatternSetTest
+-------------------------------------------------------------------------------
+Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec

Added: branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt
===================================================================
--- branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt	                        (rev 0)
+++ branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.ajax4jsf.builder.xml.XMLBodyTest
+-------------------------------------------------------------------------------
+Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.332 sec

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/AppTest.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/AppTest.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClass.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClass.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest$Proxy.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest$Proxy.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseClass.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseClass.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseInterface.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseInterface.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/ClassPatternSetTest.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/ClassPatternSetTest.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/XMLBodyTest.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/XMLBodyTest.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/generator/target/test-classes/test/TestComponent.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/generator/target/test-classes/test/TestComponent.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cdk</artifactId>
-    <groupId>org.ajax4jsf</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <groupId>org.richfaces</groupId>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ajax4jsf.cdk</groupId>
+  <groupId>org.richfaces.cdk</groupId>
   <artifactId>maven-archetype-jsf-component</artifactId>
   <name>Archetype - maven-archetype-jsf-component</name>
 </project>
\ No newline at end of file

Modified: branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -7,7 +7,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.ajax4jsf.cdk</groupId>
+				<groupId>org.richfaces.cdk</groupId>
 				<artifactId>maven-cdk-plugin</artifactId>
 				  <version>1.1.1-SNAPSHOT</version>
 				<configuration>

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,18 @@
+<archetype>
+  <id>maven-archetype-jsf-component</id>
+  <sources><!--
+    <source>src/main/java/component/_CompName.java</source>
+  -->
+    <source>src/main/java/component/README</source>
+  </sources>
+  <testSources>
+    <source>src/test/java/component/JSFComponentTest.java</source>
+  </testSources>
+  <resources><!--
+    <resource>src/main/config/component/_compName.xml</resource>
+    <resource>src/main/templates/_compName.jspx</resource>
+  -->
+    <resource>src/main/config/component/README</resource>
+    <resource>src/main/templates/README</resource>
+  </resources>
+</archetype>

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>${groupId}</groupId>
+  <artifactId>${artifactId}</artifactId>
+  <name>${artifactId}</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.richfaces.cdk</groupId>
+				<artifactId>maven-cdk-plugin</artifactId>
+				  <version>1.1.1-SNAPSHOT</version>
+				<configuration>
+					<library>
+					<prefix>${groupId}</prefix>
+					<taglib>
+						<shortName>${artifactId}</shortName>
+					</taglib>
+					</library>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/README
===================================================================

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN"  "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
+<!-- 
+<!DOCTYPE components PUBLIC "-//EXADEL//Generator config/EN"  "http://exadel.com/dtds/component-config.dtd" >
+ -->
+<components>
+	<component>
+		<name>${groupId}.${artifactId}</name>
+		<family>${groupId}.${artifactId}</family>
+		<classname>${groupId}.component.html.Html${artifactId}</classname>
+		<superclass>${groupId}.component.UI${artifactId}</superclass>
+		<description>
+			<![CDATA[
+    ]]>
+		</description>
+		<renderer generate="true" override="true">
+			<name>${groupId}.${artifactId}Renderer</name>
+			<template>${artifactId}.jspx</template>
+		</renderer>
+		<tag>
+			<name>${artifactId}</name>
+			<classname>${groupId}.taglib.${artifactId}Tag</classname>
+			<superclass>
+				org.ajax4jsf.framework.taglib.HtmlComponentTagBase
+			</superclass>
+		</tag>
+		<!--
+		<taghandler>
+			<classname>org.ajax4jsf.tag.TestHandler</classname>
+		</taghandler>
+		-->
+		&ui_component_attributes;
+		<!--
+		<property>
+			<name>param</name>
+			<classname>java.lang.String</classname>
+			<description>
+			</description>
+			<defaultvalue>"default"</defaultvalue>
+		</property>
+        -->
+	</component>
+</components>

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/README
===================================================================

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,32 @@
+/**
+ * License Agreement.
+ *
+ * Ajax4jsf 1.1 - 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 ${groupId}.component;
+
+import javax.faces.component.UIComponentBase;
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UI${artifactId} extends UIComponentBase 
+{
+}

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/README
===================================================================

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root 
+	xmlns:f="http://ajax4jsf.org/cdk/template" 
+	xmlns:c=" http://java.sun.com/jsf/core" 
+	xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+	xmlns:u=" http://ajax4jsf.org/cdk/u"
+	xmlns:x=" http://ajax4jsf.org/cdk/x"
+	class="${groupId}.renderkit.html.${artifactId}Renderer"
+	baseclass="org.ajax4jsf.framework.renderer.AjaxComponentRendererBase"
+	component="${groupId}.component.UI${artifactId}" 
+	>
+	<f:clientid var="clientId"/>
+	<div id="#{clientId}"
+		x:passThruWithExclusions="value,name,type,id"
+		>
+	</div>
+</f:root>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,53 @@
+/**
+ * License Agreement.
+ *
+ * Ajax4jsf 1.1 - 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 ${groupId}.component;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import javax.faces.component.UIComponent;
+
+/**
+ * Unit test for simple Component.
+ */
+public class JSFComponentTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public JSFComponentTest( String testName )
+    {
+        super( testName );
+    }
+
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testComponent()
+    {
+        assertTrue( true );
+    }
+}

Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/maven-archetype-jsf-component-3.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-archetype-jsf-component/target/maven-archetype-jsf-component-3.1.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>cdk</artifactId>
-    <groupId>org.ajax4jsf</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <groupId>org.richfaces</groupId>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ajax4jsf.cdk</groupId>
+  <groupId>org.richfaces.cdk</groupId>
   <artifactId>maven-archetype-jsfwebapp</artifactId>
   <name>Archetype for jsf webapp project</name>
 </project>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,16 @@
+<archetype>
+  <id>maven-archetype-jsfwebapp</id>
+  <sources>
+    <source>src/main/java/Bean.java</source>
+  </sources>
+  <testSources>
+    <source>src/test/java/BeanTest.java</source>
+  </testSources>
+  <resources>
+    <resource>src/main/webapp/index.jsp</resource>
+    <resource>src/main/webapp/pages/index.jsp</resource>
+    <resource>src/main/webapp/pages/index.xhtml</resource>
+    <resource>src/main/webapp/WEB-INF/web.xml</resource>
+    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
+  </resources>
+</archetype>

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>war</packaging>
+	<name>${artifactId} Maven Webapp</name>
+	<build>
+		<finalName>${artifactId}</finalName>
+	</build>
+
+	<dependencies>
+#if(${facelets})
+		<dependency>
+			<groupId>com.sun.facelets</groupId>
+			<artifactId>jsf-facelets</artifactId>
+			<version>1.1.12</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>el-impl</groupId>
+			<artifactId>el-impl</artifactId>
+			<version>1.0</version>
+			<scope>runtime</scope>
+		</dependency>
+#end
+	</dependencies>
+</project>

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,29 @@
+/**
+ * License Agreement.
+ *
+ * Ajax4jsf 1.1 - 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 ${package};
+/**
+ * @author $Autor$
+ *
+ */
+public class Bean {
+	
+}
\ No newline at end of file

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+
+Class-Path: 
+
+
+

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+                              "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+ <managed-bean>
+  <managed-bean-name>bean</managed-bean-name>
+  <managed-bean-class>${package}.Bean</managed-bean-class>
+  <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+</faces-config>

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS ENTITY="JSFProcess"/>

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>Archetype Created Web Application</display-name>
+ <context-param>
+  <param-name>javax.faces.CONFIG_FILES</param-name>
+  <param-value>/WEB-INF/faces-config.xml</param-value>
+ </context-param>
+ <context-param>
+  <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+  <param-value>server</param-value>
+ </context-param>
+ <!-- 
+#if(${facelets})
+ -->
+ <context-param>
+  <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+  <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+  <param-name>facelets.REFRESH_PERIOD</param-name>
+  <param-value>2</param-value>
+ </context-param>
+ <context-param>
+  <param-name>facelets.DEVELOPMENT</param-name>
+  <param-value>true</param-value>
+ </context-param>
+ <context-param>
+  <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+  <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ <!-- 
+#end
+ --> 
+ <filter>
+  <display-name>Ajax4jsf Filter</display-name>
+  <filter-name>ajax4jsf</filter-name>
+  <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+ <filter-mapping>
+  <filter-name>ajax4jsf</filter-name>
+  <servlet-name>Faces Servlet</servlet-name>
+  <dispatcher>REQUEST</dispatcher>
+  <dispatcher>FORWARD</dispatcher>
+  <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping>
+ <servlet>
+  <servlet-name>Faces Servlet</servlet-name>
+  <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+  <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+  <servlet-name>Faces Servlet</servlet-name>
+  <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+  <servlet-name>Faces Servlet</servlet-name>
+  <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+  <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,11 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<html>
+
+<head></head>
+
+	<body>
+		<jsp:forward page="/pages/index.jsf" />
+	</body>
+
+</html>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+	<head>
+		<title></title>
+	</head>
+	<body>
+		<f:view>
+			
+		</f:view>
+	</body>	
+</html>  

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"  
+      >
+	<f:view>
+
+	</f:view>
+</html>	
\ No newline at end of file

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java
===================================================================
--- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java	                        (rev 0)
+++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,46 @@
+/**
+ * License Agreement.
+ *
+ * Ajax4jsf 1.1 - 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 ${package};
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+*/
+public class BeanTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public BeanTest( String testName )
+    {
+        super( testName );
+    }
+
+    public void testStub() throws Exception {
+    	
+    }
+}

Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/maven-archetype-jsfwebapp-3.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/maven-archetype-jsfwebapp-3.1.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/refactor1/cdk/maven-cdk-plugin/pom.xml
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/cdk/maven-cdk-plugin/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,15 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<artifactId>cdk</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ajax4jsf.cdk</groupId>
+	<groupId>org.richfaces.cdk</groupId>
 	<artifactId>maven-cdk-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<name>Maven plugin for JSF components code generation</name>
-	<url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/maven-cdk-plugin/</url>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
@@ -48,7 +47,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf.cdk</groupId>
+			<groupId>org.richfaces.cdk</groupId>
 			<artifactId>generator</artifactId>
 			<version>${project.version}</version>
 		</dependency>

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,899 @@
+<plugin>
+  <description></description>
+  <groupId>org.richfaces.cdk</groupId>
+  <artifactId>maven-cdk-plugin</artifactId>
+  <version>3.1.0-SNAPSHOT</version>
+  <goalPrefix>cdk</goalPrefix>
+  <isolatedRealm>false</isolatedRealm>
+  <inheritedByDefault>true</inheritedByDefault>
+  <mojos>
+    <mojo>
+      <goal>generate-tests</goal>
+      <description></description>
+      <requiresDependencyResolution>test</requiresDependencyResolution>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>generate-test-sources</phase>
+      <executePhase>test-compile</executePhase>
+      <implementation>org.ajax4jsf.builder.mojo.GenerateTestMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>classpathElements</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>Project classpath.</description>
+        </parameter>
+        <parameter>
+          <name>compileSourceRoots</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The source directories containing the sources to be compiled.</description>
+        </parameter>
+        <parameter>
+          <name>componentConfigDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files. All &apos;*.xml&apos; files wil be
+parsed as components config. All &apos;*.ent&apos; files will be processed as
+include configurations.</description>
+        </parameter>
+        <parameter>
+          <name>executedProject</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Project executed by first compile lifecycle.</description>
+        </parameter>
+        <parameter>
+          <name>facesConfigInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for faces configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>key</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>library</name>
+          <type>org.ajax4jsf.builder.mojo.Library</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>outputJavaDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputResourcesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputTestsDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Top maven project.</description>
+        </parameter>
+        <parameter>
+          <name>resourcesInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>taglibInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>templatesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude>
+        <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory>
+        <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory>
+        <executedProject implementation="org.apache.maven.project.MavenProject">${executedProject}</executedProject>
+        <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory>
+        <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+        <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude>
+        <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory>
+        <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory>
+        <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements>
+        <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude>
+        <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+          <field-name>velocity</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>generate</goal>
+      <description>This plugin geterate JSF components and renderers source code, as well as
+configuration files.</description>
+      <requiresDependencyResolution>compile</requiresDependencyResolution>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>generate-sources</phase>
+      <executePhase>compile</executePhase>
+      <implementation>org.ajax4jsf.builder.mojo.GenerateMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>classpathElements</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>Project classpath.</description>
+        </parameter>
+        <parameter>
+          <name>compileSourceRoots</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The source directories containing the sources to be compiled.</description>
+        </parameter>
+        <parameter>
+          <name>componentConfigDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files. All &apos;*.xml&apos; files wil be
+parsed as components config. All &apos;*.ent&apos; files will be processed as
+include configurations.</description>
+        </parameter>
+        <parameter>
+          <name>executedProject</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Project executed by first compile lifecycle.</description>
+        </parameter>
+        <parameter>
+          <name>facesConfigInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for faces configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>key</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>library</name>
+          <type>org.ajax4jsf.builder.mojo.Library</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>outputJavaDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputResourcesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputTestsDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Top maven project.</description>
+        </parameter>
+        <parameter>
+          <name>resourcesInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>taglibInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>templatesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude>
+        <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory>
+        <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory>
+        <executedProject implementation="org.apache.maven.project.MavenProject">${executedProject}</executedProject>
+        <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory>
+        <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+        <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude>
+        <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory>
+        <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory>
+        <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements>
+        <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude>
+        <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+          <field-name>velocity</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>compile</goal>
+      <description>Compile all xml templates, matched given pattern to Java classes. Sources
+will be created in {@link AbstractCDKMojo#outputJavaDirectory}</description>
+      <requiresDependencyResolution>compile</requiresDependencyResolution>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>generate-sources</phase>
+      <implementation>org.ajax4jsf.builder.mojo.CompileMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>classpathElements</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>Project classpath.</description>
+        </parameter>
+        <parameter>
+          <name>compileSourceRoots</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The source directories containing the sources to be compiled.</description>
+        </parameter>
+        <parameter>
+          <name>componentConfigDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files. All &apos;*.xml&apos; files wil be
+parsed as components config. All &apos;*.ent&apos; files will be processed as
+include configurations.</description>
+        </parameter>
+        <parameter>
+          <name>defaultPackage</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>excludes</name>
+          <type>java.lang.String[]</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>A list of exclusion filters for the compiler. None by default.</description>
+        </parameter>
+        <parameter>
+          <name>executedProject</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Project executed by first compile lifecycle.</description>
+        </parameter>
+        <parameter>
+          <name>facesConfigInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for faces configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>includes</name>
+          <type>java.lang.String[]</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>A list of inclusion filters for the compiler. By default, include all
+files in templates directory.</description>
+        </parameter>
+        <parameter>
+          <name>key</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>library</name>
+          <type>org.ajax4jsf.builder.mojo.Library</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>localRepository</name>
+          <type>org.apache.maven.artifact.repository.ArtifactRepository</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The local repository.</description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>outputJavaDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputResourcesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputTestsDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>parentProject</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>The reactor projects.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Top maven project.</description>
+        </parameter>
+        <parameter>
+          <name>resourcesInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>taglibInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>templatesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <parentProject implementation="org.apache.maven.project.MavenProject">${project.parent}</parentProject>
+        <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude>
+        <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory>
+        <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory>
+        <executedProject implementation="org.apache.maven.project.MavenProject">${executedProject}</executedProject>
+        <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory>
+        <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+        <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude>
+        <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory>
+        <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory>
+        <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements>
+        <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude>
+        <localRepository implementation="org.apache.maven.artifact.repository.ArtifactRepository">${localRepository}</localRepository>
+        <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+          <field-name>velocity</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+          <field-name>mavenProjectBuilder</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.archiver.manager.ArchiverManager</role>
+          <field-name>archiverManager</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>assembly</goal>
+      <description>This plugin assembly full components library from modules, included in parent
+project. Steps to create library : 1. Got parent project, and check modules
+included in them. 2. For every module , build project and got it properties.
+3. Resolve module artifact, check for &quot;jar&quot; type and include/exclude
+criteria. for accepted modules, unpack it to classes directory, and put
+config files in separate directories. 4. Append unpacked directory to
+resources, included in result jar. 5. Merge all META-INF/faces-config.xml ,
+*.tld, *.taglib.xml , resources-config.xml into ones. 6. append dependencies
+of included projects to this.</description>
+      <requiresDependencyResolution>compile</requiresDependencyResolution>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>generate-resources</phase>
+      <implementation>org.ajax4jsf.builder.mojo.AssemblyLibraryMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>buildDirectory</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>classpathElements</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>Project classpath.</description>
+        </parameter>
+        <parameter>
+          <name>compileSourceRoots</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The source directories containing the sources to be compiled.</description>
+        </parameter>
+        <parameter>
+          <name>componentConfigDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files. All &apos;*.xml&apos; files wil be
+parsed as components config. All &apos;*.ent&apos; files will be processed as
+include configurations.</description>
+        </parameter>
+        <parameter>
+          <name>facesConfigInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for faces configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>generatedPom</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>includeTaglib</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>includeTld</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>key</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>library</name>
+          <type>org.ajax4jsf.builder.mojo.Library</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>localRepository</name>
+          <type>org.apache.maven.artifact.repository.ArtifactRepository</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The local repository.</description>
+        </parameter>
+        <parameter>
+          <name>modulesSrc</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>outputJavaDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputResourcesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputTestsDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>parentProject</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>The reactor projects.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Top maven project.</description>
+        </parameter>
+        <parameter>
+          <name>reactorProjects</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The reactor projects.</description>
+        </parameter>
+        <parameter>
+          <name>resourcesInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>taglibInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>templates</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>templatesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <parentProject implementation="org.apache.maven.project.MavenProject">${project.parent}</parentProject>
+        <buildDirectory implementation="java.io.File">${project.build.directory}</buildDirectory>
+        <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude>
+        <modulesSrc implementation="java.io.File">${project.build.directory}/src</modulesSrc>
+        <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory>
+        <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory>
+        <reactorProjects implementation="java.util.List">${reactorProjects}</reactorProjects>
+        <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory>
+        <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+        <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude>
+        <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory>
+        <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory>
+        <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements>
+        <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude>
+        <localRepository implementation="org.apache.maven.artifact.repository.ArtifactRepository">${localRepository}</localRepository>
+        <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots>
+        <generatedPom implementation="java.io.File">${project.build.directory}/pom.xml</generatedPom>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+          <field-name>velocity</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+          <field-name>resolver</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+          <field-name>factory</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+          <field-name>mavenProjectBuilder</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.archiver.manager.ArchiverManager</role>
+          <field-name>archiverManager</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>create</goal>
+      <description></description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <implementation>org.ajax4jsf.builder.mojo.CreateComponentMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>baseClass</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>classpathElements</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>Project classpath.</description>
+        </parameter>
+        <parameter>
+          <name>compileSourceRoots</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The source directories containing the sources to be compiled.</description>
+        </parameter>
+        <parameter>
+          <name>componentConfigDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files. All &apos;*.xml&apos; files wil be
+parsed as components config. All &apos;*.ent&apos; files will be processed as
+include configurations.</description>
+        </parameter>
+        <parameter>
+          <name>facesConfigInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for faces configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>key</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>library</name>
+          <type>org.ajax4jsf.builder.mojo.Library</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>markup</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>name</name>
+          <type>java.lang.String</type>
+          <required>true</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The directory for compiled classes.</description>
+        </parameter>
+        <parameter>
+          <name>outputJavaDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputResourcesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>outputTestsDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+        <parameter>
+          <name>plugins</name>
+          <type>java.util.List</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>Directory where the output Java Files will be located.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>false</required>
+          <editable>false</editable>
+          <description>Top maven project.</description>
+        </parameter>
+        <parameter>
+          <name>resourcesInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>taglibInclude</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Place for component configuration XML files</description>
+        </parameter>
+        <parameter>
+          <name>templatesDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description></description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <markup implementation="java.lang.String">${markup}</markup>
+        <plugins implementation="java.util.List">${project.build.plugins}</plugins>
+        <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude>
+        <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory>
+        <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory>
+        <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory>
+        <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory>
+        <baseClass implementation="java.lang.String" default-value="javax.faces.component.UIComponentBase">${baseClass}</baseClass>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+        <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude>
+        <name implementation="java.lang.String">${name}</name>
+        <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory>
+        <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory>
+        <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements>
+        <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude>
+        <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+          <field-name>velocity</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+  </mojos>
+  <dependencies/>
+</plugin>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,6 @@
+#macro( quietnull $a)
+#if($a)$a#end
+#end
+
+
+

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+
+package ${package}.component;
+
+import ${baseClass};
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UI${className} extends ${baseClassName} {
+	
+	private static final String COMPONENT_TYPE = "${prefix}.${className}";
+	
+	private static final String COMPONENT_FAMILY = "${prefix}.${className}";
+	
+}

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN"  "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
+<components>
+	<component>
+		<name>${prefix}.${className}</name>
+		<family>${prefix}.${className}</family>
+		<classname>${package}.component.${markup}.${markupName}${className}</classname>
+		<superclass>${package}.component.UI${className}</superclass>
+		<description>
+			<![CDATA[
+    ]]>
+		</description>
+		<renderer generate="true" override="true">
+			<name>${prefix}.${className}Renderer</name>
+			<template>${path}/${markup}${className}.jspx</template>
+		</renderer>
+		<tag>
+			<name>${name}</name>
+			<classname>${package}.taglib.${className}Tag</classname>
+			<superclass>
+				org.ajax4jsf.framework.taglib.HtmlComponentTagBase
+			</superclass>
+		</tag>
+		<!--
+		<taghandler>
+			<classname>org.ajax4jsf.tag.TestHandler</classname>
+		</taghandler>
+		-->
+		&ui_component_attributes;
+		<!--
+		<property>
+			<name>param</name>
+			<classname>java.lang.String</classname>
+			<description>
+			</description>
+			<defaultvalue>"default"</defaultvalue>
+		</property>
+        -->
+	</component>
+</components>

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root 
+	xmlns:f="http://ajax4jsf.org/cdk/template" 
+	xmlns:c=" http://java.sun.com/jsf/core" 
+	xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+	xmlns:u=" http://ajax4jsf.org/cdk/u"
+	xmlns:x=" http://ajax4jsf.org/cdk/x"
+	class="${package}.renderkit.${markup}.${className}Renderer"
+	baseclass="org.ajax4jsf.framework.renderer.AjaxComponentRendererBase"
+	component="${package}.component.UI${className}" 
+	>
+	<f:clientid var="clientId"/>
+	<div id="#{clientId}"
+		x:passThruWithExclusions="value,name,type,id"
+		>
+	</div>
+</f:root>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenCompilationContext.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenCompilationContext.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenLogger.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenLogger.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AbstractCDKMojo.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AbstractCDKMojo.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CompileMojo.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CompileMojo.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CreateComponentMojo.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CreateComponentMojo.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$1.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$1.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$2.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$2.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateTestMojo.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateTestMojo.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Library.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Library.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Renderkit.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Renderkit.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Taglib.class
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Taglib.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+                              "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+${content}
+
+#foreach( $kit in ${renderkits})
+  <render-kit>
+		#if(${kit.name})
+		<render-kit-id>${kit.name}</render-kit-id>
+		#if(${kit.classname})
+		<render-kit-class>${kit.classname}</render-kit-class>
+		#end
+		#end
+		${kit.facesConfig}
+  </render-kit>
+#end
+
+
+</faces-config>

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+${content}
+</resource-config>

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE facelet-taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
+<namespace>${library.taglib.uri}</namespace>
+
+${content}
+</facelet-taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+ <tlib-version>${library.taglib.tlibVersion}</tlib-version>
+ <jsp-version>${library.taglib.jspVersion}</jsp-version>
+#if(${library.taglib.shortName})
+ <short-name>${library.taglib.shortName}</short-name>
+#end
+ <uri>${library.taglib.uri}</uri>
+#if(${library.taglib.displayName})
+ <display-name>${library.taglib.displayName}</display-name>
+#end
+#if(${library.description})
+ <description>${library.description}</description>
+#end
+#if(${library.taglib.validatorClass})
+ <validator>
+ 	<validator-class>${library.taglib.validatorClass}</validator-class>
+ </validator>
+#end
+
+${content}
+</taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
+    version="1.2">
+
+${content}
+#foreach( $kit in ${renderkits})
+  <render-kit>
+		#if(${kit.name})
+		<render-kit-id>${kit.name}</render-kit-id>
+		#if(${kit.classname})
+		<render-kit-class>${kit.classname}</render-kit-class>
+		#end
+		#end
+		${kit.facesConfig}
+  </render-kit>
+#end
+
+
+</faces-config>

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+${content}
+</resource-config>

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE facelet-taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
+<namespace>${library.taglib.uri}</namespace>
+
+${content}
+</facelet-taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm
===================================================================
--- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm	                        (rev 0)
+++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<taglib xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+   xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="${library.taglib.jspVersion}">
+
+<tlib-version>${library.taglib.tlibVersion}</tlib-version>
+#if(${library.taglib.shortName})
+ <short-name>${library.taglib.shortName}</short-name>
+#end
+ <uri>${library.taglib.uri}</uri>
+#if(${library.taglib.displayName})
+ <display-name>${library.taglib.displayName}</display-name>
+#end
+#if(${library.description})
+ <description>${library.description}</description>
+#end
+#if(${library.taglib.validatorClass})
+ <validator>
+ 	<validator-class>${library.taglib.validatorClass}</validator-class>
+ </validator>
+#end
+
+${content}
+</taglib>
\ No newline at end of file

Added: branches/refactor1/cdk/maven-cdk-plugin/target/maven-cdk-plugin-3.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/maven-cdk-plugin-3.1.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/refactor1/cdk/pom.xml
===================================================================
--- branches/refactor1/cdk/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/cdk/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<artifactId>master</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<artifactId>root</artifactId>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ajax4jsf</groupId>
+	<groupId>org.richfaces</groupId>
 	<artifactId>cdk</artifactId>
 	<packaging>pom</packaging>
 	<name>JSF Components Development kit</name>
-	<version>1.1.2-SNAPSHOT</version>
-	<url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url>
 	<dependencies />
 	<build>
 		<pluginManagement>
@@ -30,7 +28,6 @@
 	</build>
 	<modules>
 		<module>maven-cdk-plugin</module>
-		<module>compiler</module>
 		<module>generator</module>
 		<module>maven-archetype-jsf-component</module>
 		<module>maven-archetype-jsfwebapp</module>

Modified: branches/refactor1/docs/ajaxguide/en/pom.xml
===================================================================
--- branches/refactor1/docs/ajaxguide/en/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/docs/ajaxguide/en/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.ajax4jsf.docs</groupId>
+		<groupId>org.richfaces.docs</groupId>
 		<artifactId>userguide</artifactId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<groupId>org.ajax4jsf.docs.userguide</groupId>
+	<groupId>org.richfaces.docs.userguide</groupId>
 	<artifactId>${translation}</artifactId>
 	<packaging>jar</packaging>
 	<name>Ajax4jsf Manual (${translation})</name>
@@ -28,7 +28,7 @@
 				</plugin>
 
 				<plugin>
-					<groupId>org.ajax4jsf.docs</groupId>
+					<groupId>org.richfaces.docs</groupId>
 					<artifactId>maven-docbook-plugin</artifactId>
 				</plugin>
 			</plugins>

Modified: branches/refactor1/docs/ajaxguide/pom.xml
===================================================================
--- branches/refactor1/docs/ajaxguide/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/docs/ajaxguide/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -4,13 +4,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<artifactId>docs</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ajax4jsf.docs</groupId>
+	<groupId>org.richfaces.docs</groupId>
 	<artifactId>userguide</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<description>Ajax4jsf user guide</description>
 	<pluginRepositories>
@@ -44,7 +44,7 @@
 							<configuration>
 								<artifactItems>
 									<artifactItem>
-										<groupId>org.ajax4jsf</groupId>
+										<groupId>org.richfaces</groupId>
 										<artifactId>
 											ajax4jsf
 										</artifactId>
@@ -59,7 +59,7 @@
 									</artifactItem>
 									<artifactItem>
 										<groupId>
-											org.ajax4jsf.docs
+											org.richfaces.docs
 										</groupId>
 										<artifactId>xslt</artifactId>
 										<version>
@@ -145,7 +145,7 @@
 				</plugin>
 
 				<plugin>
-					<groupId>org.ajax4jsf.docs</groupId>
+					<groupId>org.richfaces.docs</groupId>
 					<artifactId>maven-docbook-plugin</artifactId>
 					<version>${project.version}</version>
 					<executions>
@@ -170,7 +170,7 @@
 					</executions>
 					<dependencies>
 						<dependency>
-							<groupId>org.ajax4jsf.docs</groupId>
+							<groupId>org.richfaces.docs</groupId>
 							<artifactId>xslt</artifactId>
 							<version>${project.version}</version>
 						</dependency>

Modified: branches/refactor1/docs/maven-docbook-plugin/pom.xml
===================================================================
--- branches/refactor1/docs/maven-docbook-plugin/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/docs/maven-docbook-plugin/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -7,11 +7,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>docs</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.ajax4jsf.docs</groupId>
+	<groupId>org.richfaces.docs</groupId>
 	<artifactId>maven-docbook-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 
@@ -23,7 +23,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.ajax4jsf.docs</groupId>
+			<groupId>org.richfaces.docs</groupId>
 			<artifactId>docbook</artifactId>
 			<version>${project.version}</version>
 		</dependency>

Modified: branches/refactor1/docs/pom.xml
===================================================================
--- branches/refactor1/docs/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/docs/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<artifactId>richfaces-parent</artifactId>
+		<artifactId>ui</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.0.2-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../richfaces/pom.xml</relativePath>
 	</parent>
   <modelVersion>4.0.0</modelVersion>

Modified: branches/refactor1/docs/userguide/en/pom.xml
===================================================================
--- branches/refactor1/docs/userguide/en/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/docs/userguide/en/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.richfaces.docs</groupId>
 		<artifactId>userguide</artifactId>
-		<version>3.0.2-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.richfaces.docs.userguide</groupId>
@@ -28,7 +28,7 @@
 				</plugin>
 
 				<plugin>
-					<groupId>org.ajax4jsf.docs</groupId>
+					<groupId>org.richfaces.docs</groupId>
 					<artifactId>maven-docbook-plugin</artifactId>
 				</plugin>
 			</plugins>

Modified: branches/refactor1/docs/userguide/pom.xml
===================================================================
--- branches/refactor1/docs/userguide/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/docs/userguide/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>docs</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.0.2-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.docs</groupId>
@@ -80,11 +80,11 @@
 									</artifactItem>
 									<artifactItem>
 										<groupId>
-											org.ajax4jsf.docs
+											org.richfaces.docs
 										</groupId>
 										<artifactId>xslt</artifactId>
 										<version>
-											1.1.2-SNAPSHOT
+											3.1.0-SNAPSHOT
 										</version>
 										<type>jar</type>
 										<overWrite>true</overWrite>
@@ -166,9 +166,9 @@
 				</plugin>
 
 				<plugin>
-					<groupId>org.ajax4jsf.docs</groupId>
+					<groupId>org.richfaces.docs</groupId>
 					<artifactId>maven-docbook-plugin</artifactId>
-					<version>1.1.2-SNAPSHOT</version>
+					<version>3.1.0-SNAPSHOT</version>
 					<executions>
 						<execution>
 						    <id>generate</id>
@@ -191,9 +191,9 @@
 					</executions>
 					<dependencies>
 						<dependency>
-							<groupId>org.ajax4jsf.docs</groupId>
+							<groupId>org.richfaces.docs</groupId>
 							<artifactId>xslt</artifactId>
-							<version>1.1.2-SNAPSHOT</version>
+							<version>3.1.0-SNAPSHOT</version>
 						</dependency>
 					</dependencies>
 					<configuration>

Modified: branches/refactor1/docs/xslt/pom.xml
===================================================================
--- branches/refactor1/docs/xslt/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/docs/xslt/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<artifactId>docs</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ajax4jsf.docs</groupId>
+  <groupId>org.richfaces.docs</groupId>
   <artifactId>xslt</artifactId>
   <description>Docbook documentation stylesheets</description>
 </project>

Modified: branches/refactor1/extensions/gwt/pom.xml
===================================================================
--- branches/refactor1/extensions/gwt/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/extensions/gwt/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,11 +2,11 @@
 <project>
 	<parent>
 		<artifactId>master</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ajax4jsf</groupId>
+	<groupId>org.richfaces</groupId>
 	<artifactId>gwtjsf</artifactId>
 	<name>Google web toolkit and JSF integration library</name>
 	<url>https://ajax4jsf.dev.java.net</url>
@@ -97,7 +97,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>ajax4jsf</artifactId>
 			<version>${project.version}</version>
 		</dependency>

Modified: branches/refactor1/extensions/portlet/pom.xml
===================================================================
--- branches/refactor1/extensions/portlet/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/extensions/portlet/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<artifactId>master</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ajax4jsf</groupId>
+	<groupId>org.richfaces</groupId>
 	<artifactId>a4j-portlet</artifactId>
 	<name>ajax4jsf portlet brige</name>
 	<url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url>
@@ -53,14 +53,14 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>ajax4jsf</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>test</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

Modified: branches/refactor1/extensions/seam/pom.xml
===================================================================
--- branches/refactor1/extensions/seam/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/extensions/seam/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,11 +1,11 @@
 <?xml version="1.0"?><project>
   <parent>
     <artifactId>master</artifactId>
-    <groupId>org.ajax4jsf</groupId>
+    <groupId>org.richfaces</groupId>
     <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ajax4jsf</groupId>
+  <groupId>org.richfaces</groupId>
   <artifactId>a4j-seam</artifactId>
   <name>ajax4jsf and JBOSS Seam compability library</name>
   <url>https://ajax4jsf.dev.java.net</url>
@@ -33,7 +33,7 @@
       <scope>test</scope>
     </dependency>
 	<dependency>
-		<groupId>org.ajax4jsf</groupId>
+		<groupId>org.richfaces</groupId>
 		<artifactId>ajax4jsf</artifactId>
 		<version>${project.version}</version>
 	</dependency>

Modified: branches/refactor1/extensions/trinidad/pom.xml
===================================================================
--- branches/refactor1/extensions/trinidad/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/extensions/trinidad/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,11 +1,11 @@
 <?xml version="1.0"?><project>
   <parent>
     <artifactId>master</artifactId>
-    <groupId>org.ajax4jsf</groupId>
+    <groupId>org.richfaces</groupId>
     <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ajax4jsf</groupId>
+  <groupId>org.richfaces</groupId>
   <artifactId>a4j-trinidad</artifactId>
   <name>ajax4jsf and MyFaces Trinidad compability library</name>
   <url>https://ajax4jsf.dev.java.net</url>
@@ -33,7 +33,7 @@
       <scope>test</scope>
     </dependency>
 	<dependency>
-		<groupId>org.ajax4jsf</groupId>
+		<groupId>org.richfaces</groupId>
 		<artifactId>ajax4jsf</artifactId>
 		<version>${project.version}</version>
 	</dependency>

Modified: branches/refactor1/framework/impl/pom.xml
===================================================================
--- branches/refactor1/framework/impl/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/framework/impl/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,14 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<artifactId>master</artifactId>
-		<groupId>org.ajax4jsf</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<artifactId>framework</artifactId>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ajax4jsf</groupId>
-	<artifactId>ajax4jsf</artifactId>
-	<name>Java Server Faces AJAX framework</name>
-	<url>http://labs.jboss.com/wiki/Ajax4jsf/framework</url>
+	<groupId>org.richfaces.framework</groupId>
+	<artifactId>impl</artifactId>
+	<name>Java Server Faces AJAX framework implementation</name>
 	<properties>
 		<jsfVersion>1.1</jsfVersion>
 	</properties>
@@ -23,31 +22,6 @@
 		</resources>
 		<plugins>
 			<plugin>
-				<groupId>org.ajax4jsf.cdk</groupId>
-				<artifactId>maven-cdk-plugin</artifactId>
-				<version>${project.version}</version>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<library>
-						<prefix>org.ajax4jsf</prefix>
-						<jsfVersion>${jsfVersion}</jsfVersion>
-						<taglib>
-							<uri>
-								https://ajax4jsf.dev.java.net/ajax
-							</uri>
-							<shortName>a4j</shortName>
-						</taglib>
-					</library>
-				</configuration>
-			</plugin>
-			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
@@ -83,14 +57,6 @@
 			</plugin>
 		</plugins>
 	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>net.sourceforge.maven-taglib</groupId>
-				<artifactId>maven-taglib-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -123,22 +89,6 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.json-lib</groupId>
-			<artifactId>json-lib</artifactId>
-			<version>0.9</version>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-lang</groupId>
-					<artifactId>commons-lang</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xom</groupId>
-					<artifactId>xom</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 			<version>1.0.4</version>
@@ -308,33 +258,5 @@
 				</dependency>
 			</dependencies>
 		</profile>
-		<profile>
-			<id>assembly</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>net.sourceforge.maven-taglib</groupId>
-						<artifactId>maven-taglib-plugin</artifactId>
-						<configuration>
-							<taglib.src.dir>
-								${project.build.directory}/generated-component/resources/META-INF
-							</taglib.src.dir>
-							<tldDocDir>
-								${project.build.directory}/tlddoc
-							</tldDocDir>
-						</configuration>
-
-						<executions>
-							<execution>
-								<id>attach-javadoc</id>
-								<goals>
-									<goal>taglibdocjar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>
\ No newline at end of file

Added: branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml
===================================================================
--- branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml	                        (rev 0)
+++ branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+
+<faces-config>
+	<factory>
+		<render-kit-factory>org.ajax4jsf.framework.renderer.ChameleonRenderKitFactory</render-kit-factory>
+		<lifecycle-factory>org.ajax4jsf.framework.DebugLifecycleFactory</lifecycle-factory>
+	</factory>
+	<application>
+	<!-- 
+		<variable-resolver>org.ajax4jsf.framework.skin.SkinVariableResolver</variable-resolver>
+		<property-resolver>org.ajax4jsf.framework.skin.SkinPropertyResolver</property-resolver>
+	-->
+		<view-handler>org.ajax4jsf.framework.ajax.AjaxViewHandler</view-handler>
+		<state-manager>org.ajax4jsf.framework.ajax.AjaxStateManager</state-manager>
+	</application>
+  <lifecycle>
+  	<phase-listener>org.ajax4jsf.framework.renderer.AjaxPhaseListener</phase-listener>
+  	<phase-listener>org.ajax4jsf.framework.ajax.InitPhaseListener</phase-listener>
+  </lifecycle>
+    <managed-bean>
+       <managed-bean-name>a4j</managed-bean-name>
+       <managed-bean-class>org.ajax4jsf.framework.skin.VersionBean</managed-bean-class>
+       <managed-bean-scope>application</managed-bean-scope>
+    </managed-bean>
+    <managed-bean>
+       <managed-bean-name>a4jSkin</managed-bean-name>
+       <managed-bean-class>org.ajax4jsf.framework.skin.SkinBean</managed-bean-class>
+       <managed-bean-scope>application</managed-bean-scope>
+    </managed-bean>
+    <!-- 
+    <managed-bean>
+    	<managed-bean-name>ajaxContext</managed-bean-name>
+    	<managed-bean-class>org.ajax4jsf.framework.ajax.AjaxContext</managed-bean-class>
+    	<managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
+     -->
+    <component>
+
+        <component-type>javax.faces.ViewRoot</component-type>
+        <component-class>org.ajax4jsf.framework.ajax.AjaxViewRoot</component-class>
+
+        <component-extension>
+            <component-family>javax.faces.ViewRoot</component-family>
+        </component-extension>
+
+    </component>
+
+  <render-kit>
+
+    <renderer>
+      <description>
+        override the viewroot
+      </description>
+      <component-family>javax.faces.ViewRoot</component-family>
+      <renderer-type>javax.faces.ViewRoot</renderer-type>
+      <renderer-class>org.ajax4jsf.framework.renderer.AjaxViewRootRenderer</renderer-class>
+    </renderer>
+      <!-- 
+          <renderer>
+          <component-family>javax.faces.Form</component-family>
+          <renderer-type>javax.faces.Form</renderer-type>
+          <renderer-class>org.ajax4jsf.renderkit.html.AjaxFormRenderer</renderer-class>
+      </renderer>
+      <renderer>
+          <component-family>javax.faces.Command</component-family>
+          <renderer-type>javax.faces.Link</renderer-type>
+          <renderer-class>org.ajax4jsf.renderkit.html.HtmlCommandLinkRenderer</renderer-class>
+      </renderer>
+     -->
+   </render-kit>
+</faces-config>

Added: branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t
===================================================================
--- branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t	                        (rev 0)
+++ branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS ENTITY="JSFProcess"/>

Added: branches/refactor1/framework/pom.xml
===================================================================
--- branches/refactor1/framework/pom.xml	                        (rev 0)
+++ branches/refactor1/framework/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<artifactId>root</artifactId>
+		<groupId>org.richfaces</groupId>
+		<version>3.1.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.richfaces</groupId>
+	<artifactId>cdk</artifactId>
+	<packaging>pom</packaging>
+	<name>Java Server Faces AJAX framework</name>
+	<dependencies />
+	<build>
+	</build>
+	<modules>
+		<module>api</module>
+		<module>impl</module>
+  </modules>
+</project>
\ No newline at end of file

Modified: branches/refactor1/pom.xml
===================================================================
--- branches/refactor1/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,20 +1,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
-	<artifactId>master</artifactId>
+	<artifactId>root</artifactId>
 	<packaging>pom</packaging>
-	<name>RichFaces Components Examples</name>
-	<version>3.0.2-SNAPSHOT</version>
+	<name>Jboss RichFaces project</name>
+	<version>3.1.0-SNAPSHOT</version>
 	<url>http://labs.jboss.com/jbossrichfaces</url>
 	<dependencies />
 	<modules>
-		<module>richfaces</module>
+		<module>cdk</module>
+		<module>framework</module>
+		<module>ui</module>
+		<module>ui/assembly</module>
+		<module>extensions</module>		
 		<module>docs</module>
-		<module>richfaces-samples</module>
+		<module>samples</module>
 		<!--
 			<module>sandbox</module>
 		-->
-		<module>richfaces/assembly</module>
 	</modules>
 	<distributionManagement>
 		<downloadUrl>
@@ -41,7 +44,6 @@
       <id>sandbox</id>
       <modules>
         <module>sandbox</module>
-        <module>sandbox-samples</module>
       </modules>
     </profile>
   </profiles>

Modified: branches/refactor1/samples/ajaxPortlet/pom.xml
===================================================================
--- branches/refactor1/samples/ajaxPortlet/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/ajaxPortlet/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ajax4jsf</groupId>
+	<groupId>org.richfaces</groupId>
 	<artifactId>portalAjaxSample</artifactId>
 	<packaging>war</packaging>
 	<version>0.0.1</version>
@@ -20,7 +20,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>a4j-portlet</artifactId>
 			<version>1.1.1-SNAPSHOT</version>
 			<exclusions>

Modified: branches/refactor1/samples/portal-echo/pom.xml
===================================================================
--- branches/refactor1/samples/portal-echo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/portal-echo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -43,7 +43,7 @@
 	  <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.ajax4jsf</groupId>
+      <groupId>org.richfaces</groupId>
       <artifactId>a4j-portlet</artifactId>
       <version>1.1.1-SNAPSHOT</version>
 	<exclusions>

Modified: branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -4,7 +4,7 @@
 	<artifactId>richfaces-samples</artifactId>
 	<packaging>pom</packaging>
 	<name>RichFaces Components Examples</name>
-	<version>3.0.2-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<url>http://labs.jboss.com/jbossrichfaces/samples</url>
     <properties>
 		<!-- -->
@@ -59,9 +59,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>ajax4jsf</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
@@ -233,9 +233,9 @@
 			</build>
 			<dependencies>
 				<dependency>
-					<groupId>org.ajax4jsf</groupId>
+					<groupId>org.richfaces</groupId>
 					<artifactId>ajax4jsf</artifactId>
-					<version>1.1.2-SNAPSHOT</version>
+					<version>3.1.0-SNAPSHOT</version>
 					<exclusions>
 						<exclusion>
 							<groupId>javax.faces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/skins/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/skins/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/skins/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml
===================================================================
--- branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>richfaces-samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>

Modified: branches/refactor1/sandbox/pom.xml
===================================================================
--- branches/refactor1/sandbox/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -206,14 +206,14 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>ajax4jsf</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>test</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: branches/refactor1/sandbox/samples/calendar-sample/pom.xml
===================================================================
--- branches/refactor1/sandbox/samples/calendar-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/samples/calendar-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/sandbox/samples/panel2-sample/pom.xml
===================================================================
--- branches/refactor1/sandbox/samples/panel2-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/samples/panel2-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
  
 	<modelVersion>4.0.0</modelVersion>
@@ -15,12 +15,12 @@
   	<dependency>
 		<groupId>org.richfaces</groupId>
 	    <artifactId>panel2</artifactId>
-	    <version>3.0.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
   	</dependency>
   	<dependency>
 		<groupId>org.richfaces</groupId>
 	    <artifactId>richfaces</artifactId>
-	    <version>3.0.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
   	</dependency>
   	
   </dependencies>	

Modified: branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml
===================================================================
--- branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/sandbox/samples/pom.xml
===================================================================
--- branches/refactor1/sandbox/samples/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/samples/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -58,9 +58,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>ajax4jsf</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
@@ -88,7 +88,7 @@
 		<dependency>
 			<groupId>org.richfaces</groupId>
 			<artifactId>richfaces</artifactId>			
-			<version>3.0.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
@@ -212,9 +212,9 @@
 			</build>
 			<dependencies>
 				<dependency>
-					<groupId>org.ajax4jsf</groupId>
+					<groupId>org.richfaces</groupId>
 					<artifactId>ajax4jsf</artifactId>
-					<version>1.1.2-SNAPSHOT</version>
+					<version>3.1.0-SNAPSHOT</version>
 					<exclusions>
 						<exclusion>
 							<groupId>javax.faces</groupId>

Modified: branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml
===================================================================
--- branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>org.richfaces</groupId>
 			<artifactId>richfaces</artifactId>
-			<version>3.0.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 		</dependency>
 		
 			

Modified: branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml
===================================================================
--- branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/sandbox/samples/tooltip-sample/pom.xml
===================================================================
--- branches/refactor1/sandbox/samples/tooltip-sample/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/samples/tooltip-sample/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>richfaces-samples</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/sandbox/tooltip/pom.xml
===================================================================
--- branches/refactor1/sandbox/tooltip/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/tooltip/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <?xml version="1.0"?><project>
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,7 +11,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
         <version>1.1.1-SNAPSHOT</version>
         <executions>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.richfaces</groupId>
       <artifactId>common</artifactId>
-      <version>3.0.2-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: branches/refactor1/sandbox/ui/calendar/pom.xml
===================================================================
--- branches/refactor1/sandbox/ui/calendar/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/ui/calendar/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -12,9 +12,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.richfaces</groupId>
       <artifactId>common</artifactId>
-      <version>3.0.2-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: branches/refactor1/sandbox/ui/panel2/pom.xml
===================================================================
--- branches/refactor1/sandbox/ui/panel2/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/ui/panel2/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -12,9 +12,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
 		<id>generate-sources</id>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.richfaces</groupId>
       <artifactId>common</artifactId>
-      <version>3.0.2-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: branches/refactor1/sandbox/ui/panelmenu/pom.xml
===================================================================
--- branches/refactor1/sandbox/ui/panelmenu/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/ui/panelmenu/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces</groupId>
       <artifactId>common</artifactId>
-      <version>3.0.2-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

Modified: branches/refactor1/sandbox/ui/scrollable-grid/pom.xml
===================================================================
--- branches/refactor1/sandbox/ui/scrollable-grid/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/ui/scrollable-grid/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -62,14 +62,14 @@
   </build>
 	<dependencies>
     <dependency>
-      <groupId>org.ajax4jsf</groupId>
+      <groupId>org.richfaces</groupId>
       <artifactId>ajax4jsf</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.richfaces</groupId>
       <artifactId>richfaces</artifactId>
-      <version>3.0.2-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml
===================================================================
--- branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <?xml version="1.0"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/assembly/pom.xml
===================================================================
--- branches/refactor1/ui/assembly/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/assembly/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<artifactId>richfaces-parent</artifactId>
+		<artifactId>ui</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.0.2-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
@@ -12,9 +12,9 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.ajax4jsf.cdk</groupId>
+				<groupId>org.richfaces.cdk</groupId>
 				<artifactId>maven-cdk-plugin</artifactId>
-				<version>1.1.2-SNAPSHOT</version>
+				<version>3.1.0-SNAPSHOT</version>
 				<configuration>
 					<library>
 						<prefix>org.richfaces</prefix>

Modified: branches/refactor1/ui/common/pom.xml
===================================================================
--- branches/refactor1/ui/common/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/common/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>

Modified: branches/refactor1/ui/dataFilterSlider/pom.xml
===================================================================
--- branches/refactor1/ui/dataFilterSlider/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/dataFilterSlider/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -12,9 +12,9 @@
     <plugins>
 
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/dataTable/pom.xml
===================================================================
--- branches/refactor1/ui/dataTable/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/dataTable/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/datascroller/pom.xml
===================================================================
--- branches/refactor1/ui/datascroller/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/datascroller/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/drag-drop/pom.xml
===================================================================
--- branches/refactor1/ui/drag-drop/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/drag-drop/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/dropdown-menu/pom.xml
===================================================================
--- branches/refactor1/ui/dropdown-menu/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/dropdown-menu/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/gmap/pom.xml
===================================================================
--- branches/refactor1/ui/gmap/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/gmap/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/inputnumber-slider/pom.xml
===================================================================
--- branches/refactor1/ui/inputnumber-slider/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/inputnumber-slider/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-     	<version>1.1.2-SNAPSHOT</version>
+     	<version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/inputnumber-spinner/pom.xml
===================================================================
--- branches/refactor1/ui/inputnumber-spinner/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/inputnumber-spinner/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-    	<version>1.1.2-SNAPSHOT</version>
+    	<version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
 		<id>generate-sources</id>

Modified: branches/refactor1/ui/menu-components/pom.xml
===================================================================
--- branches/refactor1/ui/menu-components/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/menu-components/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/modal-panel/pom.xml
===================================================================
--- branches/refactor1/ui/modal-panel/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/modal-panel/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-    	<version>1.1.2-SNAPSHOT</version>
+    	<version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/paint2D/pom.xml
===================================================================
--- branches/refactor1/ui/paint2D/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/paint2D/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/panel/pom.xml
===================================================================
--- branches/refactor1/ui/panel/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/panel/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
 		<id>generate-sources</id>

Modified: branches/refactor1/ui/panelbar/pom.xml
===================================================================
--- branches/refactor1/ui/panelbar/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/panelbar/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/pom.xml
===================================================================
--- branches/refactor1/ui/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
-	<artifactId>richfaces-parent</artifactId>
+	<artifactId>ui</artifactId>
 	<packaging>pom</packaging>
 	<name>RichFaces Components</name>
-	<version>3.0.2-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<url>http://richfaces.ajax4jsf.org</url>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
@@ -231,14 +231,14 @@
 			<version>3.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>ajax4jsf</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.ajax4jsf</groupId>
+			<groupId>org.richfaces</groupId>
 			<artifactId>test</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: branches/refactor1/ui/separator/pom.xml
===================================================================
--- branches/refactor1/ui/separator/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/separator/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
 		<id>generate-sources</id>

Modified: branches/refactor1/ui/simpleTogglePanel/pom.xml
===================================================================
--- branches/refactor1/ui/simpleTogglePanel/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/simpleTogglePanel/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>1.1.2-SNAPSHOT</version>
+	    <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/spacer/pom.xml
===================================================================
--- branches/refactor1/ui/spacer/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/spacer/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/suggestionbox/pom.xml
===================================================================
--- branches/refactor1/ui/suggestionbox/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/suggestionbox/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>richfaces-parent</artifactId>
+        <artifactId>ui</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.ajax4jsf.cdk</groupId>
+                <groupId>org.richfaces.cdk</groupId>
                 <artifactId>maven-cdk-plugin</artifactId>
-                <version>1.1.2-SNAPSHOT</version>
+                <version>3.1.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>

Modified: branches/refactor1/ui/tabPanel/pom.xml
===================================================================
--- branches/refactor1/ui/tabPanel/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/tabPanel/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/togglePanel/pom.xml
===================================================================
--- branches/refactor1/ui/togglePanel/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/togglePanel/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	  <version>1.1.2-SNAPSHOT</version>
+	  <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/toolBar/pom.xml
===================================================================
--- branches/refactor1/ui/toolBar/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/toolBar/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: branches/refactor1/ui/tree/pom.xml
===================================================================
--- branches/refactor1/ui/tree/pom.xml	2007-06-28 20:26:00 UTC (rev 1390)
+++ branches/refactor1/ui/tree/pom.xml	2007-06-28 21:15:47 UTC (rev 1391)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>richfaces-parent</artifactId>
+    <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -11,9 +11,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.ajax4jsf.cdk</groupId>
+        <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>




More information about the richfaces-svn-commits mailing list