Author: alexsmirnov Date: 2009-08-26 20:44:00 -0400 (Wed, 26 Aug 2009) New Revision: 15328 Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbUnmarshalTest.java Removed: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshallTest.java Modified: root/cdk/trunk/plugins/annotations/pom.xml root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attributes.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DisplayName.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facet.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facets.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Fires.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplate.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplates.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIComponent.xml root/cdk/trunk/plugins/generator/.svnignore root/cdk/trunk/plugins/generator/pom.xml root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaClassRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaFieldRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaLanguageElementRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaMethodRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/BaseTagBodyConsumer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/BaseTemplateConsumer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/ChooseTagBodyConsumer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/Consumer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RootElementConsumer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/StructuralTagBodyConsumer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateBodyConsumer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateReader.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCdkContext.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkError.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelValidator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardSources.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaClassPathObject.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileSystemObject.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Extensible.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/InvalidNameException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Key.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/LibraryVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Merge.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Mergeable.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Name.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Searchable.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SearchableCollection.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/package-info.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/package-info.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractArithmeticTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBooleanTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstAndTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredExpressionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDivTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFalseTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMinusTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstModTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMultTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNullTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstOrTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPlusTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstTrueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ELNodeConstants.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Strings.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinition.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Element.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Node.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java root/cdk/trunk/plugins/generator/src/main/java/readme.txt root/cdk/trunk/plugins/generator/src/main/javadoc/generatedClasses.png root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/MVC.dia root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/MVC.png root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/generatedClasses.dia root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/generatedClasses.png root/cdk/trunk/plugins/generator/src/main/models/faces-config.mdo root/cdk/trunk/plugins/generator/src/main/resources/META-INF/plexus/components.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/component-config.dtd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_dnd_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_output_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/alt_location_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/content_component_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/display_value_only_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/doc_start.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ext_ajax_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ext_forceId_attribute.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/extended_command_link_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/extended_data_table_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/header_component_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_anchor_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_button_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_control_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_control_events.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_events.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_img_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_help_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_style_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_universal_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/spec_img_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/spec_table_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_command_button_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_command_link_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_data_table_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_input_text_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_input_textarea_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_message_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_messages_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_output_label_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_output_text_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_panel_grid_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_panel_group_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_many_listbox_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_many_menu_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_one_listbox_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_one_menu_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_one_radio_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_column_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_command_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_component_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_data_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_for_attribute.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_form_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_graphic_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_message_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_messages_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_output_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_panel_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_parameter_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_boolean_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_item_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_items_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_many_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_one_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/user_role_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/validator_min_max_attributes.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml-lat1.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml-special.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml-symbol.ent root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/javaee_5.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/javaee_web_services_1_2.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/javaee_web_services_client_1_2.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_1_2.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_2_0.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesuicomponent_2_0.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-partialresponse_2_0.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xml.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl root/cdk/trunk/plugins/generator/src/main/resources/org/ajax4jsf/builder/ant/velocity.properties root/cdk/trunk/plugins/generator/src/main/resources/org/ajax4jsf/templatecompiler/ant/velocity.properties root/cdk/trunk/plugins/generator/src/main/script/SchemaAttributesParserTask.groovy root/cdk/trunk/plugins/generator/src/main/xsd/cdk-template.xsd root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd root/cdk/trunk/plugins/generator/src/main/xsd/cdk3.xsd root/cdk/trunk/plugins/generator/src/main/xsd/javaee_5.xsd root/cdk/trunk/plugins/generator/src/main/xsd/javaee_web_services_1_2.xsd root/cdk/trunk/plugins/generator/src/main/xsd/javaee_web_services_client_1_2.xsd root/cdk/trunk/plugins/generator/src/main/xsd/web-facesconfig_2_0.xsd root/cdk/trunk/plugins/generator/src/main/xsd/xhtml-el.xsd root/cdk/trunk/plugins/generator/src/site/apt/doc.apt root/cdk/trunk/plugins/generator/src/site/resources/configurationOverview.vsd root/cdk/trunk/plugins/generator/src/site/resources/images/configOverview.gif root/cdk/trunk/plugins/generator/src/site/resources/images/exadel_logo.jpg root/cdk/trunk/plugins/generator/src/site/site.xml root/cdk/trunk/plugins/generator/src/test/ant/build.xml root/cdk/trunk/plugins/generator/src/test/config/faces-config.ent root/cdk/trunk/plugins/generator/src/test/config/html_universal_attributes.xml root/cdk/trunk/plugins/generator/src/test/config/test.xml root/cdk/trunk/plugins/generator/src/test/config/test2.xml root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/TemplateReaderTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestAnnotation.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestAnnotation2.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestInterfaceAnnotation.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestMethodAnnotation.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileManagerTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ClassDescriptionTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ModelBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/NameTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean2.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/UIComponent.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/CdkResolverTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbTestBase.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/Child.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/Id.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/Root.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/package-info.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XMLBodyMergeTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XMLBodySerializerTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XMLBodyTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XPathComparatorTest.java root/cdk/trunk/plugins/generator/src/test/java/test/TestComponent.java root/cdk/trunk/plugins/generator/src/test/resources/META-INF/templates/testComponent.ftl root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestClass.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestInterface.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestSubClass.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/logging.properties root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/test.html root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/template-simple.xml root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/template.xml root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/AbstractTestComponent.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/UITestCommand.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/component.xml root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/fragment.xml root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/include.xml root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent.xml root/cdk/trunk/plugins/generator/src/test/resources/test.source.properties Log: Faces-config.xml generator is Implemented. Property changes on: root/cdk/trunk/plugins/annotations/pom.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -30,7 +30,7 @@ import java.lang.annotation.Target; /** - * <p class="changed_added_4_0">Attribute alias. CDK will generate getters/setters for that alias wich delegate calls to original attribute methods. + * <p class="changed_added_4_0">Attribute aliases. CDK will generate getters/setters for these aliases which delegate calls to the original attribute methods. * </p> * * @author asmirnov(a)exadel.com @@ -45,11 +45,11 @@ /** * <p class="changed_added_4_0"> - * Attribute alias. That is mandatory parameter</p> + * Attribute aliases. This is mandatory parameter</p> * - * @return attribute alias. + * @return attribute aliases. */ - public String value(); + public String[] value(); Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -39,12 +39,33 @@ @Inherited public @interface Attribute { + /** + * <p class="changed_added_4_0"></p> + * @return + */ + boolean literal() default false; + + /** + * <p class="changed_added_4_0"></p> + * @return + */ boolean hidden() default false; + /** + * <p class="changed_added_4_0"></p> + * @return + */ boolean readOnly() default false; +// boolean transient() default false; + + /** + * <p class="changed_added_4_0"></p> + * @return + */ boolean passThough() default false; - String[] behavior() default {}; + boolean required() default false; + } Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attributes.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -29,8 +29,17 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import javax.faces.component.FacesComponent; + /** * <p class="changed_added_4_0"> + * That annotation marks class as JSF component. The difference with JSF 2.0 + * &#064;{@link FacesComponent} annotation is what this one could marks abstaract + * class from which a real UI-component implementation will be generated. The + * value of default {@link #value()} attribute is taken to be + * <em>component type</em>. The fully qualified class name becomes a component + * class unless that class is abstract or final component class is defined by + * the {@link Generate} annotation value. * </p> * * @author asmirnov(a)exadel.com @@ -41,18 +50,23 @@ @Inherited public @interface Component { + /** + * <p class="changed_added_4_0">Annotation class name to use as key for annotation processor class.</p> + */ public static final String NAME = "org.richfaces.cdk.annotations.Component"; /** * <p class="changed_added_4_0"> - * Type of the component. Currently that is mandatory</p> - * <p class="todo">TODO if this value is an empty, component type will be inferred from class name. + * Type of the component. Currently this is mandatory parameter because CDK + * uses <em>component-type</em> as primary key for components library model. * </p> + * <p class="todo"> + * TODO if this value is an empty, component type will be inferred from + * class name. + * </p> * * @return component type. */ - public String value(); + public String value() default ""; - - } Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java (rev 0) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,44 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +(a)Retention(RetentionPolicy.CLASS) +(a)Target({ElementType.METHOD,ElementType.FIELD}) +@Inherited +public @interface DefaultValue { + + String value(); + +} Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DisplayName.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java (rev 0) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,53 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +(a)Retention(RetentionPolicy.CLASS) +(a)Target({ElementType.METHOD,ElementType.FIELD}) +@Inherited +public @interface EventName { + + /** + * <p class="changed_added_4_0"></p> + * @return + */ + public String value() default ""; + + /** + * <p class="changed_added_4_0"></p> + * @return + */ + public boolean defaultEvent() default false; +} Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java (rev 0) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,48 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +(a)Retention(RetentionPolicy.CLASS) +(a)Target({ElementType.METHOD,ElementType.FIELD}) +@Inherited +public @interface EventNames { + + /** + * <p class="changed_added_4_0"></p> + * @return + */ + public EventName[] value(); + +} Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facets.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -30,7 +30,7 @@ import java.lang.annotation.Target; /** - * <p class="changed_added_4_0">Defines family of component or renderer.</p> + * <p class="changed_added_4_0">Defines family of the JSF component or renderer.</p> * @author asmirnov(a)exadel.com * */ @@ -39,11 +39,14 @@ @Inherited public @interface Family { + /** + * <p class="changed_added_4_0">Annotation class name to use as key for annotation processor class.</p> + */ public static final String NAME = "org.richfaces.cdk.annotations.Family"; /** * <p class="changed_added_4_0"> - * Family of the component. If this value an empty, it will be inferred. + * The value of this annotation attribute is taken to be <em>component-family</em> for annotated JSF component or renderer class. If this value an empty, it will be inferred from component type or <code>COMPONENT_FAMILY</code> constant. * </p> * * @return component family. Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Fires.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -31,28 +31,29 @@ /** * <p class="changed_added_4_0"> + * The presence of this annotation tells CDK to generate class or method + * implementation even though target does not have the {@code abstract} modifier. * </p> * * @author asmirnov(a)exadel.com * */ @Retention(RetentionPolicy.CLASS) -(a)Target(ElementType.TYPE) +@Target( { ElementType.TYPE, ElementType.METHOD }) @Inherited public @interface Generate { public static final String NAME = "org.richfaces.cdk.annotations.Generate"; + public static final String DEFAULT = NAME + ".DEFAULT"; + /** * <p class="changed_added_4_0"> - * Name of the generated component class. Currently that is mandatory</p> - * <p class="todo">TODO: if this value is an empty, component class will be inferred from class name. + * Name of the generated class. If this value was an empty, name will be inferred by CDK. * </p> * - * @return component type. + * @return generated object type. */ - public String value(); + public String value() default ""; - - } Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -37,7 +37,7 @@ * */ @Retention(RetentionPolicy.CLASS) -(a)Target({ElementType.TYPE,ElementType.METHOD}) +(a)Target({ElementType.TYPE,ElementType.METHOD,ElementType.FIELD}) @Inherited public @interface Icon { Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -30,7 +30,7 @@ import java.lang.annotation.Target; /** - * <p class="changed_added_4_0"> + * <p class="changed_added_4_0">The presence of this annotation in the JSF component class associated particular renderer with component. * </p> * * @author asmirnov(a)exadel.com @@ -45,10 +45,10 @@ /** * <p class="changed_added_4_0"> - * Type of the renderer. If this value an empty, component type will be inferred from class name. + * The value of this annotation attribute is taken to be JSF <em>renderer-type</em>. If this value was empty, component type will be inferred from by the CDK. * </p> * - * @return component type. + * @return JSF <em>renderer-type</em>. */ public String type() default ""; Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplate.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplates.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java (rev 0) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,54 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * <p class="changed_added_4_0">This annotation defines a Java method signature for attributes that hold EL {@code MethodExpression} values.</p> + * @author asmirnov(a)exadel.com + * + */ +(a)Retention(RetentionPolicy.CLASS) +(a)Target({ElementType.METHOD,ElementType.FIELD}) +@Inherited +public @interface Signature { + + /** + * <p class="changed_added_4_0">Method return type. Default is {@code Object}</p> + * @return + */ + public Class<?> returnType() default Object.class; + + /** + * <p class="changed_added_4_0">Method parameters. Default is no-argument method.</p> + * @return + */ + public Class<?>[] parameters() default {}; + +} Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java (rev 0) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,44 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +(a)Retention(RetentionPolicy.CLASS) +(a)Target({ElementType.METHOD,ElementType.FIELD}) +@Inherited +public @interface SuggestedValue { + + String value(); + +} Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java (rev 0) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,67 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * <p class="changed_added_4_0"> + * </p> + * + * @author asmirnov(a)exadel.com + * + */ +(a)Retention(RetentionPolicy.CLASS) +(a)Target(ElementType.TYPE) +@Inherited +public @interface Tag { + + public static final String NAME = "org.richfaces.cdk.annotations.Tag"; + + /** + * <p class="changed_added_4_0"> + * Name of the JSF tag that creates target component. + * </p> + * + * @return tag name. + */ + public String name(); + + /** + * <p class="changed_added_4_0">The value of this annotation attribute defines JSF renderer that will be associated with component.</p> + * @return + */ + public Renderer renderer(); + + /** + * <p class="changed_added_4_0">Taglib url in which generated tag will be defined. By default CDK uses url defined in the built project.</p> + * @return + */ + public String taglib() default ""; + +} Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -50,10 +50,19 @@ * <p class="todo">TODO: if this value is an empty, class will be inferred from the base class name. * </p> * - * @return component type. + * @return name of the generated test class. */ - public String className(); + public String testClass(); + /** + * <p class="changed_added_4_0">The value of this annotation attribute is taken to be a name of the generated test method.</p> + * @return + */ + public String testMethod() default ""; + /** + * <p class="changed_added_4_0">The value of this annotation attribute tells CDK what kind of tests should be generated.</p> + * @return + */ + public TestType type() default TestType.ALL; - } Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java (rev 0) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,46 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.annotations; + +/** + * <p class="changed_added_4_0">Types of automatically generated tests.</p> + * @author asmirnov(a)exadel.com + * + */ +public enum TestType { + + /** + * <p class="changed_added_4_0">Generate tests for JSF <b>RENDER_RESPONSE</b> phase.</p> + */ + RENDER, + /** + * <p class="changed_added_4_0"></p> + */ + DECODE, + /** + * <p class="changed_added_4_0">Generate all possible tests.</p> + */ + ALL + +} Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -1,7 +1,34 @@ /** * <h1>Java annotations used by the CDK.</h1> + * <h2>Class-level annotations:</h2> + * <p>Mandatory:</p> + * <p>&#064;{@link Component}("component.Type") or &#064;{@link javax.faces.component.FacesComponent}("component.Type").</p> + * <p>Optional:</p> + * <ul> + * <li>&#064;{@link Family}("component.Family") defines component family used in the generated class.<br /></li> + * <li>&#064;{@link Generate}("component.UIClass") tells CDK to generate concrete component class ( base UI... or renderer-specific ).</li> + * <li>&#064;{@link Test}(testClass="component.Test",testMethod="testFoo",testType={@link TestType}.DECODE) tells CDK to generate unit test for that component.</li> + * <li>&#064;{@link Renderer}("retnderer.Type") , &#064;{@link RendererTemplate}("/renderer/template.xml") associate renderer with that component. The first one defines independently created renderer, while &#064;{@link RendererTemplate tells CDK to generate renderer class from that template. It is possible to define more than one template with component class using &#064;{@link RendererTemplates}({&#064;{@link RendererTemplate}("one.xml"),&#064;{@link RendererTemplate}("two.xml").<br /></li> + * <li>&#064;{@link Attributes}({"base.xml","command.xml"}) defines fragments of faces-config.xml which contain standart attributes definitions. CDK also tries to read META-INF/cdk/attributes/[classname].xml file for all component superclasses and interfaces, therefore it is not necessary to explicit include definitions for UIComponent and any other standard JSF classes. CDK defines couple of its own "urn" namespaces: "urn:resource:" for classpath resources, "urn:config:" for for project configuration folder and "urn:attributes:" for META-INF/cdk/attributes/ in the annotations library.<br /></li> + * <li>&#064;{@link Fires}({MyEvent.class}) defines event classes that this component could fire.</li> + * <li>&#064;{@link Icon} , &#064;{@link DisplayName} - optional IDE-related parameters.<br /></li> + * </ul> + * <p> </p> + * <h2>Attribute level annotations ( for getter or setter level ):</h2> + * <ul> + * <li>&#064;{@link Attribute}(literal="false",hidden="false",readOnly="false",passTrough="true") markes attribute getter/setter.</li> + * <li>&#064;{@link Signature}(returnType=boolean.class,parameters={Object.class,String.class}) defines Java method signature for attributes that holds MethodExpression objects.</li> + * <li>&#064;{@link Generate} forces CDK to generate attribute getter/setter. Without that annotation CDK will generate implementation for abstract methods only.</li> + * <li>&#064;{@link Alias}({"foo","bar"})</li> + * <li>&#064;{@link EventName}(value="click",defaultEvent=true) defines behavior event name for that attribute. To define more than one event name they could be grouped as &#064;{@link EventNames}({&#064;{@link EventName}("foo),&#064;{@link EventName}("bar")})</li> + * <li>&#064;{@link DefaultValue}("12"), &#064;{@link SuggestedValue}("12") ...</li> + * <li>&#064;{@link Icon} , &#064;{@link DisplayName} - optional IDE-related parameters.</li> + * </ul> + * <p> </p> + *<h3>Facet annotations.</h3> +* <p>There are two methods to define component facet. At the class level, developer could use &#064;{@link Facets annotations. It is also possible to define facet getter/setter methods for facet and mark one of them with &#064;{@link Facet} annotation.</p> + * */ package org.richfaces.cdk.annotations; - Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIComponent.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/.svnignore ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/pom.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaClassRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaFieldRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaLanguageElementRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaMethodRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/BaseTagBodyConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/BaseTemplateConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/ChooseTagBodyConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/Consumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererTemplateParser.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererTemplateParser.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -34,6 +34,7 @@ import org.richfaces.cdk.CdkException; import org.richfaces.cdk.ModelBuilder; import org.richfaces.cdk.StandardSources; +import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.RenderKit; @@ -69,6 +70,7 @@ if(null != family){ renderer.setFamily(family); } + renderer.setRendererClass(new ClassDescription(template.getJavaClass().getFullName())); } catch (FileNotFoundException e) { // TODO - log errors, marks mojo failed after whole build cycle. throw new CdkException(e); Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererTemplateParser.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RootElementConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/StructuralTagBodyConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateBodyConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateReader.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCdkContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkError.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -34,6 +34,7 @@ import org.richfaces.cdk.apt.ComponentProcessor; import org.richfaces.cdk.generate.java.ComponentClassGenerator; import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.xmlconfig.FacesConfigGenerator; import org.richfaces.cdk.xmlconfig.FacesConfigParser; /** @@ -150,6 +151,8 @@ generator = new ComponentClassGenerator(); } else if (StandardOutputs.RENDERER_CLASSES.equals(type)) { generator = new RendererClassGenerator(); + } else if (StandardOutputs.FACES_CONFIG.equals(type)) { + generator = new FacesConfigGenerator(); } else { generator = new DummyGenerator(); // TODO - make service method for new source types. Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelValidator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardSources.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -23,6 +23,7 @@ package org.richfaces.cdk.apt; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -30,6 +31,7 @@ import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; +import javax.faces.component.FacesComponent; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -38,6 +40,7 @@ import javax.lang.model.element.Name; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; +import javax.lang.model.type.MirroredTypesException; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.ElementFilter; @@ -46,19 +49,28 @@ import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.Attributes; import org.richfaces.cdk.annotations.Component; +import org.richfaces.cdk.annotations.DefaultValue; import org.richfaces.cdk.annotations.DisplayName; +import org.richfaces.cdk.annotations.EventName; +import org.richfaces.cdk.annotations.EventNames; import org.richfaces.cdk.annotations.Facet; +import org.richfaces.cdk.annotations.Facets; import org.richfaces.cdk.annotations.Family; import org.richfaces.cdk.annotations.Generate; import org.richfaces.cdk.annotations.Icon; +import org.richfaces.cdk.annotations.Signature; +import org.richfaces.cdk.annotations.SuggestedValue; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.util.Strings; import org.richfaces.cdk.xmlconfig.CdkEntityResolver; import org.richfaces.cdk.xmlconfig.FragmentParser; +import com.google.common.collect.Lists; + /** - * <p class="changed_added_4_0"> + * <p class="changed_added_4_0">That class process component-related annotations such as {@link Component} or {@link FacesComponent} and stores information in model. * </p> * * @author asmirnov(a)exadel.com @@ -120,6 +132,7 @@ } // process classes annotated as "FacesComponent". TypeElement facesComponentAnnotation = this.processingEnv.getElementUtils().getTypeElement(FACES_COMPONENT); + // TODO - extrach AnnotationMirror processing into separate methods. Set<? extends TypeElement> annotatedWith = ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(facesComponentAnnotation)); for (TypeElement element : annotatedWith) { List<? extends AnnotationMirror> mirrors = element.getAnnotationMirrors(); @@ -163,7 +176,8 @@ setComponentDescription(componentElement, component); processFacets(componentElement,component); // TODO - process Events attribute. - // TODO - renderers, .... + // TODO - process renderers ( @Renderer and @RendererTemplate attribute. + // TODO - process @Test annotations. // Process attributes. processAttributes(componentElement, component); } @@ -190,16 +204,19 @@ // Flags. facet.setGenerate(beanProperty.isExists()); } - // TODO - @Facets annotation. -// Face attributes = componentElement -// .getAnnotation(Attributes.class); -// if (null != attributes) { -// String[] includes = attributes.value(); -// for (String attributesConfig : includes) { -// // process additional properties. -// component.getAttributes().addAll(fragmentParser.parseProperties(attributesConfig)); -// } -// } + // @Facets annotation. + Facets facetsAnnotation = componentElement + .getAnnotation(Facets.class); + if (null != facetsAnnotation) { + Facet[] facets = facetsAnnotation.value(); + for (Facet facet : facets) { + if (!Strings.isEmpty(facet.value())) { + component.findOrCreateFacet(facet.value()); + } else { + // TODO - record error. + } + } + } } @@ -266,25 +283,68 @@ Attribute.class, componentElement); // TODO - encapsulate attribute builder into utility class. for (BeanProperty beanProperty : properties) { - Property atribute = component.findOrCreateAttribute(beanProperty + Property attribute = component.findOrCreateAttribute(beanProperty .getName()); + // Flags + Attribute attributeAnnotarion = beanProperty.getAnnotation(Attribute.class); + attribute.setHidden(attributeAnnotarion.hidden()); + attribute.setLiteral(attributeAnnotarion.literal()); + attribute.setPassThrough(attributeAnnotarion.passThough()); + attribute.setRequired(attributeAnnotarion.required()); + attribute.setReadOnly(attributeAnnotarion.readOnly()); // Documentation - atribute.setDescription(beanProperty.getDocComment()); + attribute.setDescription(beanProperty.getDocComment()); Icon icon = beanProperty.getAnnotation(Icon.class); if (null != icon) { - atribute.setIcon(icon.value()); + attribute.setIcon(icon.value()); } DisplayName displayName = beanProperty .getAnnotation(DisplayName.class); if (null != displayName) { - atribute.setDisplayname(displayName.value()); + attribute.setDisplayname(displayName.value()); } // type. - atribute.setType(new ClassDescription(beanProperty.getType() + attribute.setType(new ClassDescription(beanProperty.getType() .toString())); + // MethodExpression call signature. + Signature signature = beanProperty.getAnnotation(Signature.class); + if(null != signature){ + List<ClassDescription> parameters = Lists.newArrayList(); + try { + for (Class<?> parameterType : signature.parameters()) { + parameters.add(new ClassDescription(parameterType.getName())); + } + } catch (MirroredTypesException e) { + for(TypeMirror parameterType :e.getTypeMirrors()){ + parameters.add(new ClassDescription(parameterType.toString())); + } + } + // signature parameters always should be replaced. + attribute.setSignature(parameters); + // TODO - set method return type. + } + // Behavior events. + EventName eventName = beanProperty.getAnnotation(EventName.class); + setBehaviorEvent(attribute, eventName); + EventNames eventNames = beanProperty.getAnnotation(EventNames.class); + if(null != eventNames){ + for (EventName eventNameInstance : eventNames.value()) { + setBehaviorEvent(attribute, eventNameInstance); + } + } + // DefaultValues + DefaultValue defaultValue = beanProperty.getAnnotation(DefaultValue.class); + if(null != defaultValue){ + attribute.setDefaultValue(defaultValue.value()); + } + SuggestedValue suggestedValue = beanProperty.getAnnotation(SuggestedValue.class); + if(null != suggestedValue){ + attribute.setSuggestedValue(suggestedValue.value()); + } // Flags. - atribute.setGenerate(beanProperty.isExists()); + attribute.setGenerate(!beanProperty.isExists()); } + // Process XML files with standard attributes definitions. Attributes attributes = componentElement .getAnnotation(Attributes.class); if (null != attributes) { @@ -294,15 +354,29 @@ component.getAttributes().addAll(fragmentParser.parseProperties(attributesConfig)); } } - // TODO - Process standard information for parent classes + // Process standard information for parent classes + processTypeProperties(component,componentElement.getSuperclass()); + // and interfaces. List<? extends TypeMirror> interfaces = componentElement.getInterfaces(); for (TypeMirror interfaceMirror : interfaces) { processTypeProperties(component,interfaceMirror); } - processTypeProperties(component,componentElement.getSuperclass()); - // and interfaces. } + private void setBehaviorEvent(Property attribute, EventName eventName) { + if(null != eventName){ + org.richfaces.cdk.model.EventName event = new org.richfaces.cdk.model.EventName(); + event.setName(eventName.value()); + event.setDefaultEvent(eventName.defaultEvent()); + attribute.getEventNames().add(event); + } + } + + /** + * <p class="changed_added_4_0">Reccursive method to find and process standard class or interface attributes.</p> + * @param component + * @param interfaceMirror + */ private void processTypeProperties( org.richfaces.cdk.model.Component component, TypeMirror interfaceMirror) { Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaClassPathObject.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileSystemObject.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -28,7 +28,7 @@ @SuppressWarnings("serial") @XmlType(name="faces-config-componentType") @XmlAccessorType( XmlAccessType.NONE ) -public final class Component implements ModelElement<Component,Component.Type>, DescriptionGroup,Extensible { +public final class Component extends ModelElementBase implements ModelElement<Component,Component.Type> { /** @@ -52,30 +52,8 @@ */ private ClassDescription baseClass; - /** - * <p class="changed_added_4_0"> - * Long description for documentation - * </p> - */ - private String description; - - /** - * <p class="changed_added_4_0"> - * Short name for IDE tools - * </p> - */ - private String displayname; - - private String family; /** - * <p class="changed_added_4_0"> - * Icon name for IDE tools - * </p> - */ - private String icon; - - /** * <p class="changed_added_4_0">Is that component c</p> */ private boolean generate = true; @@ -127,8 +105,6 @@ */ private final Set<Renderer> renderers = Sets.newHashSet(); - private ConfigExtension extension; - public Component(Type key) { this.type = key; } @@ -167,19 +143,6 @@ } /** - * <p class="changed_added_4_0"></p> - * @return the extension - */ - @XmlElement(name="component-extensions") - public ConfigExtension getExtension() { - return extension; - } - - public void setExtension(ConfigExtension extension) { - this.extension = extension; - } - - /** * <p class="changed_added_4_0"> * Reepresent a component family. In the faces-config element that property encoded as * <component><component-extension><cdk:component-family>.... @@ -248,51 +211,6 @@ this.baseClass = baseClass; } - /* (non-Javadoc) - * @see org.richfaces.cdk.model.DescriptionGroup#getDescription() - */ - @XmlElement - public String getDescription() { - return description; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.model.DescriptionGroup#setDescription(java.lang.String) - */ - public void setDescription(String description) { - this.description = description; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.model.DescriptionGroup#getDisplayname() - */ - @XmlElement(name="display-name") - public String getDisplayname() { - return displayname; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.model.DescriptionGroup#setDisplayname(java.lang.String) - */ - public void setDisplayname(String displayname) { - this.displayname = displayname; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.model.DescriptionGroup#getIcon() - */ - @XmlElement - public String getIcon() { - return icon; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.model.DescriptionGroup#setIcon(java.lang.String) - */ - public void setIcon(String icon) { - this.icon = icon; - } - /** * <p class="changed_added_4_0"></p> * @return the generate Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -84,8 +84,7 @@ @Override public RenderKit create(RenderKit.Id key) { - RenderKit rendererKit = new RenderKit(); - rendererKit.setType(key); + RenderKit rendererKit = new RenderKit(key); return rendererKit; } }; Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Extensible.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -29,7 +29,7 @@ * */ @SuppressWarnings("serial") -public class Facet implements ModelElement<Facet,Facet.Name>,DescriptionGroup,Extensible<ConfigExtension>{ +public class Facet extends ModelElementBase implements ModelElement<Facet,Facet.Name> { public static final class Name extends Key { @@ -40,13 +40,6 @@ private final Name name; - private String description; - - private String displayname; - private String icon; - - private ConfigExtension extension; - private boolean generate; /** * <p class="changed_added_4_0"></p> @@ -70,55 +63,6 @@ } /** * <p class="changed_added_4_0"></p> - * @return the description - */ - @Merge - public String getDescription() { - return description; - } - - /** - * <p class="changed_added_4_0"></p> - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the displayname - */ - public String getDisplayname() { - return displayname; - } - - /** - * <p class="changed_added_4_0"></p> - * @param displayname the displayname to set - */ - public void setDisplayname(String displayname) { - this.displayname = displayname; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the icon - */ - public String getIcon() { - return icon; - } - - /** - * <p class="changed_added_4_0"></p> - * @param icon the icon to set - */ - public void setIcon(String icon) { - this.icon = icon; - } - - /** - * <p class="changed_added_4_0"></p> * @return the generate */ public boolean isGenerate() { @@ -133,22 +77,6 @@ this.generate = generate; } - /** - * <p class="changed_added_4_0"></p> - * @return the extension - */ - public ConfigExtension getExtension() { - return extension; - } - - /** - * <p class="changed_added_4_0"></p> - * @param extension the extension to set - */ - public void setExtension(ConfigExtension extension) { - this.extension = extension; - } - @Override public void merge(Facet other) { ComponentLibrary.merge(this, other); Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/InvalidNameException.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Key.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/LibraryVisitor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Merge.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Mergeable.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,73 @@ +package org.richfaces.cdk.model; + +import javax.xml.bind.annotation.XmlElement; + +import org.richfaces.cdk.model.Component.Type; + +public class ModelElementBase implements DescriptionGroup,Extensible<ConfigExtension> { + + /** + * <p class="changed_added_4_0"> + * Long description for documentation + * </p> + */ + private String description; + /** + * <p class="changed_added_4_0"> + * Short name for IDE tools + * </p> + */ + private String displayname; + /** + * <p class="changed_added_4_0"> + * Icon name for IDE tools + * </p> + */ + private String icon; + private ConfigExtension extension; + + public ModelElementBase() { + super(); + } + + @XmlElement + public final String getDescription() { + return description; + } + + public final void setDescription(String description) { + this.description = description; + } + + @XmlElement(name = "display-name") + public final String getDisplayname() { + return displayname; + } + + public final void setDisplayname(String displayname) { + this.displayname = displayname; + } + + @XmlElement + public final String getIcon() { + return icon; + } + + public final void setIcon(String icon) { + this.icon = icon; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the extension + */ + @XmlElement(name = "component-extensions") + public final ConfigExtension getExtension() { + return extension; + } + + public final void setExtension(ConfigExtension extension) { + this.extension = extension; + } + +} \ No newline at end of file Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Name.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -33,7 +33,7 @@ * */ @SuppressWarnings("serial") -public class Property implements DescriptionGroup, ModelElement<Property,Property.Name>, Extensible { +public class Property extends ModelElementBase implements ModelElement<Property,Property.Name> { public static final class Name extends Key { @@ -50,24 +50,6 @@ private ClassDescription type; /** - * <p class="changed_added_4_0">Attribute description</p> - */ - private String description; - - /** - * <p class="changed_added_4_0">Display name for IDE</p> - */ - private String displayname; - - /** - * <p class="changed_added_4_0"> - * Icon name for IDE tools - * </p> - */ - private String icon; - - - /** * <p class="changed_added_4_0">Is that bean property generate in the class or should be generated ?</p> */ private boolean generate=false; @@ -77,6 +59,8 @@ private boolean literal=false; private boolean required=false; + + private boolean readOnly = false; private String defaultValue; @@ -90,8 +74,6 @@ private Set<String> aliases = Sets.newHashSet(); - private ConfigExtension extension; - /** * <p class="changed_added_4_0"></p> * @param name @@ -119,57 +101,6 @@ /** * <p class="changed_added_4_0"></p> - * @return the description - */ - @Merge - public String getDescription() { - return description; - } - - /** - * <p class="changed_added_4_0"></p> - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the displayname - */ - @Merge - public String getDisplayname() { - return displayname; - } - - /** - * <p class="changed_added_4_0"></p> - * @param displayname the displayname to set - */ - public void setDisplayname(String displayname) { - this.displayname = displayname; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the icon - */ - @Merge - public String getIcon() { - return icon; - } - - /** - * <p class="changed_added_4_0"></p> - * @param icon the icon to set - */ - public void setIcon(String icon) { - this.icon = icon; - } - - /** - * <p class="changed_added_4_0"></p> * @return the type */ @Merge @@ -242,6 +173,7 @@ * <p class="changed_added_4_0"></p> * @return the eventNames */ + @Merge public Set<EventName> getEventNames() { return eventNames; } @@ -312,6 +244,24 @@ /** * <p class="changed_added_4_0"></p> + * @param readOnly the readOnly to set + */ + public void setReadOnly(boolean readOnly) { + this.readOnly = readOnly; + } + + + /** + * <p class="changed_added_4_0"></p> + * @return the readOnly + */ + public boolean isReadOnly() { + return readOnly; + } + + + /** + * <p class="changed_added_4_0"></p> * @return the passThrough */ public boolean isPassThrough() { @@ -332,6 +282,7 @@ * <p class="changed_added_4_0"></p> * @return the signature */ + @Merge(true) public List<ClassDescription> getSignature() { return signature; } @@ -364,24 +315,6 @@ } - /** - * <p class="changed_added_4_0"></p> - * @return the extension - */ - public ConfigExtension getExtension() { - return extension; - } - - - /** - * <p class="changed_added_4_0"></p> - * @param extension the extension to set - */ - public void setExtension(ConfigExtension extension) { - this.extension = extension; - } - - @Override public void merge(Property other) { ComponentLibrary.merge(this, other); Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -33,7 +33,7 @@ * */ @SuppressWarnings("serial") -public class RenderKit implements ModelElement<RenderKit,RenderKit.Id> { +public class RenderKit extends ModelElementBase implements ModelElement<RenderKit,RenderKit.Id> { /** * <p class="changed_added_4_0"></p> @@ -45,7 +45,7 @@ /** * <p class="changed_added_4_0"></p> - * @param type + * @param id */ public Id(String type) { // Null value means default render kit. @@ -57,7 +57,7 @@ } } - private Id type; + private final Id id; private ClassDescription renderKitClass; @@ -71,20 +71,24 @@ } }; + public RenderKit(Id id) { + this.id = id; + } + /* (non-Javadoc) * @see org.richfaces.cdk.model.ModelElement#getType() */ @Override public Id getKey() { - return type; + return getId(); } /** * <p class="changed_added_4_0"></p> - * @param type the type to set + * @return the id */ - public void setType(Id type) { - this.type = type; + public Id getId() { + return id; } /** Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -31,13 +31,15 @@ * */ @SuppressWarnings("serial") -public class Renderer implements ModelElement<Renderer,Renderer.Type> { +public class Renderer extends ModelElementBase implements ModelElement<Renderer,Renderer.Type> { private Type type; private JavaClass template; private String family; + + private ClassDescription rendererClass; @Override public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) { @@ -91,6 +93,26 @@ } /** + * <p class="changed_added_4_0"></p> + * @return the rendererClass + */ + public ClassDescription getRendererClass() { + return rendererClass; + } + /** + * <p class="changed_added_4_0"></p> + * @param rendererClass the rendererClass to set + */ + public void setRendererClass(ClassDescription rendererClass) { + this.rendererClass = rendererClass; + } + + @Override + public void merge(Renderer other) { + ComponentLibrary.merge(this, other); + } + + /** * <p class="changed_added_4_0">Key for lookup renderer in the model.</p> * @author asmirnov(a)exadel.com * @@ -111,9 +133,4 @@ } - @Override - public void merge(Renderer other) { - ComponentLibrary.merge(this, other); - } - } Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Searchable.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SearchableCollection.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/package-info.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/package-info.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractArithmeticTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBooleanTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstAndTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredExpressionTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDivTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEqualTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFalseTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanEqualTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanEqualTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMinusTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstModTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMultTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotEqualTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNullTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstOrTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPlusTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstTrueTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ELNodeConstants.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Strings.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,89 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig; + +import java.io.File; +import java.io.IOException; + +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkWriter; +import org.richfaces.cdk.StandardOutputs; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class FacesConfigGenerator implements CdkWriter { + + private static final String FACES_CONFIG_XML = "META-INF/faces-config.xml"; + private CdkContext context; + private JAXBBinding jaxbBinding; + private FacesConfigAdapter libraryAdapter; + public static final String FACES_SCHEMA_LOCATION = ComponentLibrary.FACES_CONFIG_NAMESPACE+" "+ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; + + /* (non-Javadoc) + * @see org.richfaces.cdk.CdkWriter#init(org.richfaces.cdk.CdkContext) + */ + @Override + public void init(CdkContext context) throws CdkException { + this.context = context; + jaxbBinding = JAXBBinding.getInstance(context); + libraryAdapter = new FacesConfigAdapter(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary) + */ + @Override + public void render(ComponentLibrary library) throws CdkException { + File outputFolder = context.getOutputFolder(StandardOutputs.FACES_CONFIG); + File facesConfigXml = new File(outputFolder,FACES_CONFIG_XML); + try { + if(facesConfigXml.exists()){ + // TODO - check last modification time and bypass generation for non-modified source. + facesConfigXml.delete(); + } else if(!facesConfigXml.getParentFile().exists()){ + facesConfigXml.getParentFile().mkdirs(); + } + facesConfigXml.createNewFile(); + try { + // TODO - transform output to strip prefixes from faces-config namespace. + jaxbBinding.marshal(facesConfigXml, FACES_SCHEMA_LOCATION, libraryAdapter.marshal(library)); + } catch (Exception e) { + if (e instanceof CdkException) { + throw (CdkException) e; + } else { + throw new CdkException(e); + } + } + } catch(IOException e){ + throw new CdkException("error create faces-config.xml", e); + } + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,49 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig; + +import org.richfaces.cdk.model.ComponentLibrary; + +/*import com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper;*/ + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class FacesConfigNamespacePreffixMapper /*extends NamespacePrefixMapper*/ { + + /* (non-Javadoc) + * @see com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper#getPreferredPrefix(java.lang.String, java.lang.String, boolean) + */ + public String getPreferredPrefix(String namespaceUri, String suggestion, boolean required) { + if(ComponentLibrary.FACES_CONFIG_NAMESPACE.equals(namespaceUri)){ + return ""; + } else if (ComponentLibrary.CDK_EXTENSIONS_NAMESPACE.equals(namespaceUri)) { + return "cdk"; + } + return suggestion; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -29,6 +29,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; @@ -39,13 +40,16 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.util.ValidationEventCollector; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; @@ -61,6 +65,8 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.XMLReader; +import com.google.common.collect.ImmutableSet; + /** * <p class="changed_added_4_0"> * </p> @@ -70,6 +76,8 @@ */ public class JAXBBinding { + private static final FacesConfigNamespacePreffixMapper PREFFIX_MAPPER = new FacesConfigNamespacePreffixMapper(); + private CdkContext context; private CdkEntityResolver resolver; @@ -160,7 +168,7 @@ } @SuppressWarnings("unchecked") - private <T> T unmarshal(String schemaLocation, Class<T> bindClass, + public <T> T unmarshal(String schemaLocation, Class<T> bindClass, InputSource inputSource) throws CdkException { T unmarshal = null; Source source = createXmlSource(inputSource, schemaLocation); @@ -182,7 +190,44 @@ } return unmarshal; } + + public <T> void marshal(File output,String schemaLocation,T model) throws CdkException { + try { + FileOutputStream outputStream = new FileOutputStream(output); + StreamResult result = new StreamResult(outputStream); + marshal(result, schemaLocation, model); + outputStream.flush(); + outputStream.close(); + } catch (FileNotFoundException e) { + throw new CdkException("File not found", e); + } catch (IOException e) { + throw new CdkException("XML file writting error", e); + } + + } + + public <T> void marshal(Result output,String schemaLocation,T model) throws CdkException { + try { + JAXBContext jc = JAXBContext.newInstance(model.getClass()); + Marshaller marshaller = jc.createMarshaller(); + marshaller.setProperty("jaxb.formatted.output", Boolean.TRUE); + // TODO - let writer to define additional schemes. +// marshaller.setProperty("jaxb.schemaLocation", Boolean.TRUE); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, + true); + if (null != schemaLocation) { + marshaller.setProperty(Marshaller.JAXB_SCHEMA_LOCATION, + schemaLocation); +// marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", PREFFIX_MAPPER); + } + marshaller.marshal(model, output); + } catch (JAXBException e) { + throw new CdkException("JAXB Marshaller error", e); + } finally { + + } + } /** * <p class="changed_added_4_0"> * Close input source after parsing. @@ -235,6 +280,7 @@ } + private static final ImmutableSet<String> ignoreProperties = ImmutableSet.of("class","extension"); /** * <p class="changed_added_4_0"> * This method creates adapter object and copies properties from model @@ -266,7 +312,7 @@ } } - public static <A, T extends ModelElement<T, K>, K extends Key> T createModelElement( + public static <A, T extends ModelElement<? super T, K>, K extends Key> T createModelElement( Class<T> modelClass, A adapter, K key) throws CdkException { try { Constructor<T> constructor = modelClass.getConstructor(key @@ -365,14 +411,14 @@ String name = targetProperty.getName(); for (PropertyDescriptor sourceProperty : sourceProperties) { Method readMethod = sourceProperty.getReadMethod(); - if (name.equals(sourceProperty.getName()) + if (!ignoreProperties.contains(name) && name.equals(sourceProperty.getName()) && null != readMethod) { Class<?> targetType = targetProperty.getPropertyType(); Class<?> sourceType = sourceProperty.getPropertyType(); Object propertyValue = readMethod.invoke(source); if (null != propertyValue) { if (null != writeMethod) { - if (targetType.isAssignableFrom(sourceType)) { + if (targetType.equals(sourceType)) { writeMethod.invoke(destination, propertyValue); } else if (targetType.equals(String.class)) { Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,50 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +import org.richfaces.cdk.model.Attribute; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.xmlconfig.JAXBBinding; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class AttributeAdapter extends XmlAdapter<AttributeBean, Attribute> { + + @Override + public AttributeBean marshal(Attribute v) throws Exception { + return JAXBBinding.createAdapter(AttributeBean.class, v); + } + + @Override + public Attribute unmarshal(AttributeBean v) throws Exception { + return JAXBBinding.createModelElement(Attribute.class, v, new Property.Name(v.getName())); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,134 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.Extensible; +import org.richfaces.cdk.xmlconfig.model.PropertyBean.PropertyExtension; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class AttributeBean extends DescriptionGroupBean implements Extensible<PropertyBean.PropertyExtension>{ + private String name; + + private ClassDescription type; + + private String defaultValue; + + private String suggestedValue; + + private PropertyExtension extension; + + /** + * <p class="changed_added_4_0"></p> + * @return the name + */ + @XmlElement(name="attribute-name",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getName() { + return name; + } + + /** + * <p class="changed_added_4_0"></p> + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the type + */ + @XmlElement(name="attribute-class",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + @XmlJavaTypeAdapter(ClassAdapter.class) + public ClassDescription getType() { + return type; + } + + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set + */ + public void setType(ClassDescription type) { + this.type = type; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the defaultValue + */ + @XmlElement(name="default-value",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getDefaultValue() { + return defaultValue; + } + + /** + * <p class="changed_added_4_0"></p> + * @param defaultValue the defaultValue to set + */ + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the suggestedValue + */ + @XmlElement(name="suggested-value",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getSuggestedValue() { + return suggestedValue; + } + + /** + * <p class="changed_added_4_0"></p> + * @param suggestedValue the suggestedValue to set + */ + public void setSuggestedValue(String suggestedValue) { + this.suggestedValue = suggestedValue; + } + + @Override + @XmlElement(name="attribute-extension",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + public PropertyExtension getExtension() { + return extension; + } + + /** + * <p class="changed_added_4_0"></p> + * @param extension the extension to set + */ + @Override + public void setExtension(PropertyExtension extension) { + this.extension = extension; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -103,7 +103,7 @@ * <p class="changed_added_4_0"></p> * @return the attributes */ - @XmlElements({@XmlElement(name=&quot;property&quot;,namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE,type=PropertyBean.class),(a)XmlElement(name=&quot;attribute&quot;,type=PropertyBean.class)}) + @XmlElements({@XmlElement(name="property",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE,type=PropertyBean.class),@XmlElement(name="attribute",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE,type=AttributeBean.class)}) // @XmlElement(name="attributes",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) public List<Property> getAttributes() { return attributes; Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,71 @@ +package org.richfaces.cdk.xmlconfig.model; + +import javax.xml.bind.annotation.XmlElement; + +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.DescriptionGroup; +import org.richfaces.cdk.model.Extensible; +import org.richfaces.cdk.xmlconfig.model.FacetBean.FacetExtension; + +public class DescriptionGroupBean implements DescriptionGroup { + + private String icon; + private String description; + private String displayname; + + public DescriptionGroupBean() { + super(); + } + + /** + * <p class="changed_added_4_0"></p> + * @return the icon + */ + @XmlElement(name = "icon", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public final String getIcon() { + return icon; + } + + /** + * <p class="changed_added_4_0"></p> + * @param icon the icon to set + */ + public final void setIcon(String icon) { + this.icon = icon; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the description + */ + @XmlElement(name = "description", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public final String getDescription() { + return description; + } + + /** + * <p class="changed_added_4_0"></p> + * @param description the description to set + */ + public final void setDescription(String description) { + this.description = description; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the displayname + */ + @XmlElement(name = "display-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public final String getDisplayname() { + return displayname; + } + + /** + * <p class="changed_added_4_0"></p> + * @param displayname the displayname to set + */ + public final void setDisplayname(String displayname) { + this.displayname = displayname; + } + +} \ No newline at end of file Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -26,6 +26,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.xmlconfig.JAXBBinding; /** * <p class="changed_added_4_0"></p> @@ -36,13 +37,15 @@ @Override public FacesConfigBean marshal(ComponentLibrary v) throws Exception { - FacesConfigBean facesConfigBean = new FacesConfigBean(); + FacesConfigBean facesConfigBean = JAXBBinding.createAdapter(FacesConfigBean.class, v); return facesConfigBean; } @Override public ComponentLibrary unmarshal(FacesConfigBean v) throws Exception { ComponentLibrary library = new ComponentLibrary(); + JAXBBinding.copyProperties(v, library); + JAXBBinding.copyExtensions(v, library, false); return library; } Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -31,6 +31,7 @@ import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.RenderKit; import com.google.common.collect.Lists; @@ -46,6 +47,10 @@ @XmlJavaTypeAdapter(ComponentAdapter.class) private List<Component> components = Lists.newArrayList(); + @XmlElement(name="render-kit",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + @XmlJavaTypeAdapter(RenderKitAdapter.class) + private List<RenderKit> renderKits = Lists.newArrayList(); + /** * <p class="changed_added_4_0"></p> * @return the components @@ -61,4 +66,20 @@ public void setComponents(List<Component> components) { this.components = components; } + + /** + * <p class="changed_added_4_0"></p> + * @return the renderKits + */ + public List<RenderKit> getRenderKits() { + return renderKits; + } + + /** + * <p class="changed_added_4_0"></p> + * @param renderKits the renderKits to set + */ + public void setRenderKits(List<RenderKit> renderKits) { + this.renderKits = renderKits; + } } Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -36,7 +36,7 @@ * @author asmirnov(a)exadel.com * */ -public class FacetBean implements Extensible<FacetBean.FacetExtension>,DescriptionGroup{ +public class FacetBean extends DescriptionGroupBean implements Extensible<FacetBean.FacetExtension>,DescriptionGroup{ /** * <p class="changed_added_4_0"></p> @@ -70,12 +70,6 @@ private FacetExtension extension; - private String icon; - - private String description; - - private String displayname; - /** * <p class="changed_added_4_0"></p> * @return the name @@ -95,56 +89,6 @@ /** * <p class="changed_added_4_0"></p> - * @return the icon - */ - @XmlElement(name="icon",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getIcon() { - return icon; - } - - /** - * <p class="changed_added_4_0"></p> - * @param icon the icon to set - */ - public void setIcon(String icon) { - this.icon = icon; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the description - */ - @XmlElement(name="description",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getDescription() { - return description; - } - - /** - * <p class="changed_added_4_0"></p> - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the displayname - */ - @XmlElement(name="display-name",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getDisplayname() { - return displayname; - } - - /** - * <p class="changed_added_4_0"></p> - * @param displayname the displayname to set - */ - public void setDisplayname(String displayname) { - this.displayname = displayname; - } - /** - * <p class="changed_added_4_0"></p> * @return the extension */ @XmlElement(name="facet-extension",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -45,7 +45,7 @@ * @author asmirnov(a)exadel.com * */ -public class PropertyBean implements Extensible<PropertyBean.PropertyExtension>,DescriptionGroup { +public class PropertyBean extends DescriptionGroupBean implements Extensible<PropertyBean.PropertyExtension> { /** * <p class="changed_added_4_0"></p> @@ -62,6 +62,8 @@ private boolean required; + private boolean readOnly; + private boolean passThrough=false; private Set<EventName> eventNames = Sets.newHashSet(); @@ -140,6 +142,22 @@ /** * <p class="changed_added_4_0"></p> + * @return the readOnly + */ + public boolean isReadOnly() { + return readOnly; + } + + /** + * <p class="changed_added_4_0"></p> + * @param readOnly the readOnly to set + */ + public void setReadOnly(boolean readOnly) { + this.readOnly = readOnly; + } + + /** + * <p class="changed_added_4_0"></p> * @return the passThrough */ @XmlElement(name="pass-through",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -214,12 +232,6 @@ private ClassDescription type; - private String icon; - - private String description; - - private String displayname; - private String defaultValue; private String suggestedValue; @@ -263,57 +275,6 @@ /** * <p class="changed_added_4_0"></p> - * @return the icon - */ - @XmlElement(name="icon",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getIcon() { - return icon; - } - - /** - * <p class="changed_added_4_0"></p> - * @param icon the icon to set - */ - public void setIcon(String icon) { - this.icon = icon; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the description - */ - @XmlElement(name="description",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getDescription() { - return description; - } - - /** - * <p class="changed_added_4_0"></p> - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the displayname - */ - @XmlElement(name="display-name",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getDisplayname() { - return displayname; - } - - /** - * <p class="changed_added_4_0"></p> - * @param displayname the displayname to set - */ - public void setDisplayname(String displayname) { - this.displayname = displayname; - } - - /** - * <p class="changed_added_4_0"></p> * @return the defaultValue */ @XmlElement(name="default-value",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,50 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.RenderKit; +import org.richfaces.cdk.xmlconfig.JAXBBinding; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class RenderKitAdapter extends XmlAdapter<RenderKitBean, RenderKit> { + + @Override + public RenderKitBean marshal(RenderKit v) throws Exception { + return JAXBBinding.createAdapter(RenderKitBean.class, v); + } + + @Override + public RenderKit unmarshal(RenderKitBean v) throws Exception { + return JAXBBinding.createModelElement(RenderKit.class, v, new RenderKit.Id(v.getId())); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,134 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + + +import java.util.List; + +import javax.faces.render.RenderKitFactory; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.Extensible; +import org.richfaces.cdk.model.Renderer; + +import com.google.common.collect.Lists; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class RenderKitBean extends DescriptionGroupBean implements Extensible<RenderKitBean.RenderKitExtension>{ + + /** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ + public static class RenderKitExtension extends ConfigExtension { + + } + + @XmlElement(name="render-kit-extension",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + private RenderKitExtension extension; + + @XmlElement(name="render-kit-id",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + private String id = RenderKitFactory.HTML_BASIC_RENDER_KIT; + + @XmlElement(name="render-kit-class",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + @XmlJavaTypeAdapter(ClassAdapter.class) + private ClassDescription renderkitClass; + + @XmlElement(name="renderer",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + @XmlJavaTypeAdapter(RendererAdapter.class) + private List<Renderer> renderers = Lists.newArrayList(); + + /** + * <p class="changed_added_4_0"></p> + * @return the renderkitClass + */ + public ClassDescription getRenderkitClass() { + return renderkitClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @param renderkitClass the renderkitClass to set + */ + public void setRenderkitClass(ClassDescription renderkitClass) { + this.renderkitClass = renderkitClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the id + */ + public String getId() { + return id; + } + + /** + * <p class="changed_added_4_0"></p> + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the renderers + */ + public List<Renderer> getRenderers() { + return renderers; + } + + /** + * <p class="changed_added_4_0"></p> + * @param renderers the renderers to set + */ + public void setRenderers(List<Renderer> renderers) { + this.renderers = renderers; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the extension + */ + public RenderKitExtension getExtension() { + return extension; + } + + /** + * <p class="changed_added_4_0"></p> + * @param extension the extension to set + */ + public void setExtension(RenderKitExtension extension) { + this.extension = extension; + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,50 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.Renderer; +import org.richfaces.cdk.xmlconfig.JAXBBinding; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class RendererAdapter extends XmlAdapter<RendererBean, Renderer> { + + @Override + public RendererBean marshal(Renderer v) throws Exception { + return JAXBBinding.createAdapter(RendererBean.class, v); + } + + @Override + public Renderer unmarshal(RendererBean v) throws Exception { + return JAXBBinding.createModelElement(Renderer.class, v, new Renderer.Type(v.getType())); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,126 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.Extensible; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class RendererBean extends DescriptionGroupBean implements Extensible<RendererBean.RendererExtension>{ + + /** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ + public static class RendererExtension extends ConfigExtension { + + } + + @XmlElement(name="renderer-type",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + private String type; + + @XmlElement(name="component-family",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + private String family; + + @XmlElement(name="renderer-class",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + @XmlJavaTypeAdapter(ClassAdapter.class) + private ClassDescription rendererClass; + + @XmlElement(name="renderer-extension",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) + private RendererExtension extension; + + /** + * <p class="changed_added_4_0"></p> + * @return the type + */ + public String getType() { + return type; + } + + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the family + */ + public String getFamily() { + return family; + } + + /** + * <p class="changed_added_4_0"></p> + * @param family the family to set + */ + public void setFamily(String family) { + this.family = family; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the rendererClass + */ + public ClassDescription getRendererClass() { + return rendererClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @param rendererClass the rendererClass to set + */ + public void setRendererClass(ClassDescription rendererClass) { + this.rendererClass = rendererClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the extension + */ + public RendererExtension getExtension() { + return extension; + } + + /** + * <p class="changed_added_4_0"></p> + * @param extension the extension to set + */ + public void setExtension(RendererExtension extension) { + this.extension = extension; + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -10,6 +10,7 @@ xmlns = { @javax.xml.bind.annotation.XmlNs( prefix = "cdk", namespaceURI = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE ) }) @XmlJavaTypeAdapters({(a)XmlJavaTypeAdapter(type=Property.class,value=PropertyAdapter.class), + @XmlJavaTypeAdapter(type=Attribute.class,value=AttributeAdapter.class), @XmlJavaTypeAdapter(type=ComponentLibrary.class,value=FacesConfigAdapter.class) }) @@ -20,5 +21,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.Attribute; import org.richfaces.cdk.model.Property; Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Attribute.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinition.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Element.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Node.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/java/readme.txt ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/javadoc/generatedClasses.png ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/MVC.dia ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/MVC.png ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/generatedClasses.dia ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/javadoc/org/richfaces/cdk/generatedClasses.png ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/models/faces-config.mdo ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/plexus/components.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/component-config.dtd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_dnd_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_output_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/alt_location_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/content_component_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/display_value_only_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/doc_start.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ext_ajax_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ext_forceId_attribute.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/extended_command_link_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/extended_data_table_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/header_component_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_anchor_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_button_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_control_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_control_events.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_events.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_img_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_help_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_style_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/html_universal_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/spec_img_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/spec_table_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_command_button_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_command_link_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_data_table_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_input_text_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_input_textarea_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_message_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_messages_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_output_label_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_output_text_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_panel_grid_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_panel_group_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_many_listbox_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_many_menu_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_one_listbox_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_one_menu_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/standard_select_one_radio_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_column_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_command_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_component_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_data_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_for_attribute.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_form_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_graphic_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_message_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_messages_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_output_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_panel_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_parameter_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_boolean_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_item_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_items_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_many_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/ui_select_one_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/user_role_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/entities/validator_min_max_attributes.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml-lat1.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml-special.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml-symbol.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd 2009-08-27 00:44:00 UTC (rev 15328) @@ -16,8 +16,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" - $Revision: 1.1 $ - $Date: 2007/05/15 02:42:22 $ + $Revision$ + $Date$ --> Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/javaee_5.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/javaee_web_services_1_2.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/javaee_web_services_client_1_2.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_1_2.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_1_2.xsd 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_1_2.xsd 2009-08-27 00:44:00 UTC (rev 15328) @@ -48,7 +48,7 @@ <xsd:annotation> <xsd:documentation> - $Id: web-facesconfig_1_2.xsd,v 1.15 2008/03/26 17:46:42 rlubke Exp $ + $Id$ </xsd:documentation> </xsd:annotation> Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_1_2.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_2_0.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_2_0.xsd 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_2_0.xsd 2009-08-27 00:44:00 UTC (rev 15328) @@ -48,7 +48,7 @@ <xsd:annotation> <xsd:documentation> - $Id: web-facesconfig_2_0.xsd,v 1.1.8.2 2008/03/20 21:12:50 edburns Exp $ + $Id$ </xsd:documentation> </xsd:annotation> Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesconfig_2_0.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesuicomponent_2_0.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesuicomponent_2_0.xsd 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesuicomponent_2_0.xsd 2009-08-27 00:44:00 UTC (rev 15328) @@ -48,7 +48,7 @@ <xsd:annotation> <xsd:documentation> - $Id: web-facesuicomponent_2_0.xsd,v 1.1.8.2 2008/03/20 21:12:50 edburns Exp $ + $Id$ </xsd:documentation> </xsd:annotation> Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facesuicomponent_2_0.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-partialresponse_2_0.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-partialresponse_2_0.xsd 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-partialresponse_2_0.xsd 2009-08-27 00:44:00 UTC (rev 15328) @@ -47,7 +47,7 @@ <xsd:annotation> <xsd:documentation> - $Id: web-partialresponse_2_0.xsd,v 1.0 2008/12/04 21:12:50 rogerk Exp $ + $Id$ </xsd:documentation> </xsd:annotation> Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-partialresponse_2_0.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xml.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/org/ajax4jsf/builder/ant/velocity.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/org/ajax4jsf/templatecompiler/ant/velocity.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/script/SchemaAttributesParserTask.groovy ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/cdk-template.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/cdk3.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/javaee_5.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/javaee_web_services_1_2.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/javaee_web_services_client_1_2.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/xsd/web-facesconfig_2_0.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/xsd/web-facesconfig_2_0.xsd 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/main/xsd/web-facesconfig_2_0.xsd 2009-08-27 00:44:00 UTC (rev 15328) @@ -48,7 +48,7 @@ <xsd:annotation> <xsd:documentation> - $Id: web-facesconfig_2_0.xsd,v 1.1.8.2 2008/03/20 21:12:50 edburns Exp $ + $Id$ </xsd:documentation> </xsd:annotation> Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/web-facesconfig_2_0.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/main/xsd/xhtml-el.xsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/site/apt/doc.apt ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/site/resources/configurationOverview.vsd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/site/resources/images/configOverview.gif ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/site/resources/images/exadel_logo.jpg ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/site/site.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/ant/build.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/config/faces-config.ent ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/config/html_universal_attributes.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/config/test.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/config/test2.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/TemplateReaderTest.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestAnnotation.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestAnnotation2.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestInterfaceAnnotation.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TestMethodAnnotation.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileManagerTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ClassDescriptionTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ModelBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/NameTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean2.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/UIComponent.java ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/CdkResolverTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,33 @@ +package org.richfaces.cdk.xmlconfig; + +import static org.junit.Assert.*; + +import java.io.StringWriter; + +import javax.xml.transform.stream.StreamResult; + +import org.junit.Test; +import org.richfaces.cdk.AbstractCdkContext; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.RenderKit; +import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; + +public class JaxbMarshalTest extends JaxbTestBase { + + @Test + public void testMarshalResultStringT() throws Exception { + JAXBBinding jaxbBinding = JAXBBinding.getInstance(new AbstractCdkContext(this.getClass().getClassLoader())); + ComponentLibrary library = new ComponentLibrary(); + Component component = library.findOrCreateComponent("foo.bar"); + RenderKit renderKit = library.findOrCreateRenderKit("HTML"); + renderKit.findOrCreateRenderer("foo.Renderer"); + StringWriter writer = new StringWriter(); + StreamResult result = new StreamResult(writer); + FacesConfigAdapter adapter = new FacesConfigAdapter(); + jaxbBinding.marshal(result, FacesConfigGenerator.FACES_SCHEMA_LOCATION, adapter.marshal(library)); + System.out.println(writer.toString()); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshallTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshallTest.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshallTest.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -1,81 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.xmlconfig; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; -import static javax.lang.model.util.ElementFilter.*; - -import java.io.StringReader; -import java.util.Set; - -import javax.xml.bind.JAXB; - -import org.junit.Test; -import org.richfaces.cdk.xmlconfig.testmodel.Child; -import org.richfaces.cdk.xmlconfig.testmodel.Root; - -/** - * <p class="changed_added_4_0"> - * </p> - * - * @author asmirnov(a)exadel.com - * - */ -public class JaxbMarshallTest extends JaxbTestBase { - - @Test - public void testRootElement() throws Exception { - Root root = unmarshal( - Root.class, - "<root-config xmlns='http://foo.bar/schema' ><name>foo</name><children><id>xxx</id><value>bar</value></children></root-config>"); - assertEquals("foo", root.getName()); - Set<Child> children = root.getChildren(); - assertEquals(1, children.size()); - assertEquals("xxx", children.iterator().next().getId()); - } - - @Test - public void testUniqueElement() throws Exception { - Root root = unmarshal( - Root.class, - "<root-config xmlns='http://foo.bar/schema' ><name>foo</name><children><id>xxx</id><value>bar</value></children><children><id>xxx</id><value>baz</value></children></root-config>"); - assertEquals("foo", root.getName()); - Set<Child> children = root.getChildren(); - assertEquals(1, children.size()); - assertEquals("xxx", children.iterator().next().getId()); - } - - @Test - public void testExtensions() throws Exception { - Root root = unmarshal( - Root.class, - "<root-config xmlns='http://foo.bar/schema' ><name>foo</name><children><id>xxx</id><value>bar</value><extension><e:myExtension xmlns:e=\"http://foo.bar/extensions\">eee</e:myExtension><s:foo xmlns:s=\"urn:foo\">foo</s:foo></extension></children></root-config>"); - Set<Child> children = root.getChildren(); - assertEquals(1, children.size()); - Child child = children.iterator().next(); - assertEquals(1, child.getExtension().getExtensions().size()); - assertEquals("eee", child.getWrapped()); - } -} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbTestBase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Copied: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbUnmarshalTest.java (from rev 15326, root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshallTest.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbUnmarshalTest.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbUnmarshalTest.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -0,0 +1,81 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig; + +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; +import static javax.lang.model.util.ElementFilter.*; + +import java.io.StringReader; +import java.util.Set; + +import javax.xml.bind.JAXB; + +import org.junit.Test; +import org.richfaces.cdk.xmlconfig.testmodel.Child; +import org.richfaces.cdk.xmlconfig.testmodel.Root; + +/** + * <p class="changed_added_4_0"> + * </p> + * + * @author asmirnov(a)exadel.com + * + */ +public class JaxbUnmarshalTest extends JaxbTestBase { + + @Test + public void testRootElement() throws Exception { + Root root = unmarshal( + Root.class, + "<root-config xmlns='http://foo.bar/schema' ><name>foo</name><children><id>xxx</id><value>bar</value></children></root-config>"); + assertEquals("foo", root.getName()); + Set<Child> children = root.getChildren(); + assertEquals(1, children.size()); + assertEquals("xxx", children.iterator().next().getId()); + } + + @Test + public void testUniqueElement() throws Exception { + Root root = unmarshal( + Root.class, + "<root-config xmlns='http://foo.bar/schema' ><name>foo</name><children><id>xxx</id><value>bar</value></children><children><id>xxx</id><value>baz</value></children></root-config>"); + assertEquals("foo", root.getName()); + Set<Child> children = root.getChildren(); + assertEquals(1, children.size()); + assertEquals("xxx", children.iterator().next().getId()); + } + + @Test + public void testExtensions() throws Exception { + Root root = unmarshal( + Root.class, + "<root-config xmlns='http://foo.bar/schema' ><name>foo</name><children><id>xxx</id><value>bar</value><extension><e:myExtension xmlns:e=\"http://foo.bar/extensions\">eee</e:myExtension><s:foo xmlns:s=\"urn:foo\">foo</s:foo></extension></children></root-config>"); + Set<Child> children = root.getChildren(); + assertEquals(1, children.size()); + Child child = children.iterator().next(); + assertEquals(1, child.getExtension().getExtensions().size()); + assertEquals("eee", child.getWrapped()); + } +} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbUnmarshalTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/Child.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/Id.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/Root.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/package-info.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XMLBodyMergeTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XMLBodySerializerTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XMLBodyTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/XPathComparatorTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/test/java/test/TestComponent.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/test/TestComponent.java 2009-08-26 16:45:30 UTC (rev 15327) +++ root/cdk/trunk/plugins/generator/src/test/java/test/TestComponent.java 2009-08-27 00:44:00 UTC (rev 15328) @@ -29,9 +29,9 @@ /** - * @author shura (latest modification by $Author: ishabalov $) + * @author shura (latest modification by $Author$) - * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:03 $ + * @version $Revision$ $Date$ * Property changes on: root/cdk/trunk/plugins/generator/src/test/java/test/TestComponent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/META-INF/templates/testComponent.ftl ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestClass.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestInterface.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestSubClass.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/logging.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/test.html ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/template-simple.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/template.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/AbstractTestComponent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/UITestCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/component.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/fragment.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/include.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/test.source.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id