Author: alexsmirnov Date: 2010-04-05 20:29:33 -0400 (Mon, 05 Apr 2010) New Revision: 16722 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyModel.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/MockController.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/DescriptionProcessorTest.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java Modified: root/cdk/trunk/plugins/annotations/src/main/java/javax/annotation/Nullable.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/JsfBehaviorRenderer.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfValidator.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/SubComponent.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/TagType.java root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/base-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/column-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/command-button-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/core-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/direct-link-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/events-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/focus-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/form-form-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/graphic-image-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/i18n-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/image-button-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/input-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/input-secret-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/input-textarea-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource2.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.EditableValueHolder.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIColumn.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UICommand.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIComponent.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIData.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIForm.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIGraphic.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIInput.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessage.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessages.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UINamingContainer.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutcomeTarget.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutput.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIPanel.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIParameter.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectBoolean.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItem.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItems.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectMany.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectOne.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIViewRoot.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ValueHolder.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/link-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/list-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/listbox-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/menu-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/message-message-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/messages-messages-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-format-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-label-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-resource-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-text-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/panel-grid-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/panel-group-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectmany-checkbox-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectmany-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectone-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectone-radio-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/table-props.xml root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/text-props.xml root/cdk/trunk/plugins/attributes/pom.xml root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Adapters.java root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/ContainerType.java root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Element.java root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/KeyedType.java root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Schema.java root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/SchemaSet.java root/cdk/trunk/plugins/attributes/src/test/java/org/richfaces/cdk/attributes/AttributesTest.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.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/PropertyBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementBeanBase.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/ValidatorBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestRunner.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java root/cdk/trunk/plugins/maven-cdk-plugin/.svnignore root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/UITestCommand.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/event/TestEvent.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/verify.bsh root/cdk/trunk/plugins/maven-cdk-plugin/src/it/settings.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/config/faces-config.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/component/AbstractTestPanel.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/AbstractTestPanelRenderer.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/SimpleTestRenderer.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/verify.bsh root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenLogger.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractCDKMojo.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractGenerateMojo.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/CompileMojo.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Library.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Renderkit.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/SkinInfo.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Taglib.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/mdo/resource-config.mdo root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/VM_global_library.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/component/UIClass.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/component/config.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/component/template.jspx root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/archetype/src/main/java/images/BaseImage.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/archetype/src/main/resources/images/README.txt root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/archetype/src/test/java/images/BaseImageTest.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/core.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/editor.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-slider.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/layout.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/list-shuttle.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/ordering-list.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/paint2d.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelmenu.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/pick-list.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/extclasses/extended.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/extclasses/extended_classes.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/skin.properties root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/skin.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/component-dependencies.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/faces-config.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/resources-config.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/taglib.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/tld.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/xcss.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/faces-config.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/resources-config.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/taglib.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/tld.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/xcss.vm root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/component/theme.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties root/cdk/trunk/plugins/maven-cdk-plugin/src/site/apt/index.apt root/cdk/trunk/plugins/maven-cdk-plugin/src/site/apt/usage.apt root/cdk/trunk/plugins/maven-cdk-plugin/src/site/resources/images/exadel_logo.jpg root/cdk/trunk/plugins/maven-cdk-plugin/src/site/site.xml root/cdk/trunk/plugins/xinclude/pom.xml root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/ProcessingException.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/SAXConsumer.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformer.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/PointerPart.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/ShorthandPart.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/UnsupportedPart.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointer.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerContext.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerPart.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XmlnsPart.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMStreamer.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMUtils.java root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/ElementInfo.java root/cdk/trunk/plugins/xinclude/src/main/javacc/xpointer-fw.jj root/cdk/trunk/plugins/xinclude/src/test/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformerTest.java root/cdk/trunk/plugins/xinclude/src/test/resources/just-text.txt root/cdk/trunk/plugins/xinclude/src/test/resources/test.xml root/cdk/trunk/plugins/xinclude/src/test/resources/test.xslt root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-deprecated_xpointer.xml root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-fallback.xml root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-text-only.xml root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-xml.xml root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-xpointer.xml Log: CODING IN PROGRESS - issue RF-8567: Cleanup Annotation processor code https://jira.jboss.org/jira/browse/RF-8567 set svn:keywords to track changes Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/javax/annotation/Nullable.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfBehaviorRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfValidator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SubComponent.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SubComponent.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SubComponent.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -1,5 +1,5 @@ /* - * $Id: JsfComponent.java 16684 2010-03-30 12:16:40Z Alex.Kolonitsky $ + * $Id$ * * License Agreement. * Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SubComponent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagType.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/base-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/column-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/command-button-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/core-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/direct-link-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/events-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/focus-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/form-form-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/graphic-image-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/i18n-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/image-button-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/input-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/input-secret-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/input-textarea-props.xml ___________________________________________________________________ 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.ActionSource.xml ___________________________________________________________________ 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.ActionSource2.xml ___________________________________________________________________ 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.EditableValueHolder.xml ___________________________________________________________________ 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.UIColumn.xml ___________________________________________________________________ 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.UICommand.xml ___________________________________________________________________ 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/annotations/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIData.xml ___________________________________________________________________ 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.UIForm.xml ___________________________________________________________________ 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.UIGraphic.xml ___________________________________________________________________ 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.UIInput.xml ___________________________________________________________________ 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.UIMessage.xml ___________________________________________________________________ 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.UIMessages.xml ___________________________________________________________________ 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.UINamingContainer.xml ___________________________________________________________________ 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.UIOutcomeTarget.xml ___________________________________________________________________ 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.UIOutput.xml ___________________________________________________________________ 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.UIPanel.xml ___________________________________________________________________ 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.UIParameter.xml ___________________________________________________________________ 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.UISelectBoolean.xml ___________________________________________________________________ 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.UISelectItem.xml ___________________________________________________________________ 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.UISelectItems.xml ___________________________________________________________________ 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.UISelectMany.xml ___________________________________________________________________ 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.UISelectOne.xml ___________________________________________________________________ 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.UIViewRoot.xml ___________________________________________________________________ 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.ValueHolder.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/link-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/list-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/listbox-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/menu-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/message-message-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/messages-messages-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-format-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-label-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-resource-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/output-text-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/panel-grid-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/panel-group-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectmany-checkbox-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectmany-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectone-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/selectone-radio-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/table-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/annotations/src/main/resources/META-INF/cdk/attributes/text-props.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/pom.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Adapters.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/ContainerType.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Element.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/KeyedType.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Schema.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/SchemaSet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/attributes/src/test/java/org/richfaces/cdk/attributes/AttributesTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -60,7 +60,7 @@ this.parser = parser; } - public void process(SourceUtils.BeanProperty beanProperty, PropertyBase attribute) { + protected void processAttribute(SourceUtils.BeanProperty beanProperty, PropertyBase attribute) { attribute.setType(beanProperty.getType()); @@ -223,7 +223,7 @@ properties.addAll(sourceUtils.getAbstractBeanProperties(element)); // TODO - encapsulate attribute builder into utility class. for (BeanProperty beanProperty : properties) { - process(beanProperty, component.getOrCreateAttribute(beanProperty.getName())); + processAttribute(beanProperty, component.getOrCreateAttribute(beanProperty.getName())); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -189,7 +189,7 @@ final void processFacet(Facet facet, FacetModel facetModel, String docComment) { setDescription(facetModel, facet.description(), docComment); facetModel.setGenerate(facet.generate()); - } + } final void setComponeneFamily(TypeElement componentElement, ComponentModel component, String family) { if (!Strings.isEmpty(family)) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -25,6 +25,7 @@ import org.richfaces.cdk.annotations.Description; import org.richfaces.cdk.model.DescriptionGroup; +import org.richfaces.cdk.util.Strings; /** * <p class="changed_added_4_0"></p> @@ -35,14 +36,39 @@ @Override public void processDescription(DescriptionGroup model, Description description, String docComment) { - // TODO Auto-generated method stub - + if (!Strings.isEmpty(docComment)) { + model.setDescription(docComment); + } + if (description != null) { + setIcon(model, description); + if (!Strings.isEmpty(description.displayName())) { + model.setDisplayname(description.displayName()); + } + if (!Strings.isEmpty(description.value())) { + model.setDescription(description.value()); + } + } } @Override public void processDescription(DescriptionGroup model, Description description) { - // TODO Auto-generated method stub + processDescription(model, description,null); } + protected void setIcon(DescriptionGroup component, Description icon) { + if (null != icon && (!Strings.isEmpty(icon.smallIcon()) || !Strings.isEmpty(icon.largeIcon()))) { + DescriptionGroup.Icon iconValue = new DescriptionGroup.Icon(); + if (!Strings.isEmpty(icon.smallIcon())) { + iconValue.setSmallIcon(icon.smallIcon()); + } + + if (!Strings.isEmpty(icon.largeIcon())) { + iconValue.setLargeIcon(icon.largeIcon()); + } + + component.setIcon(iconValue); + } + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -10,6 +10,7 @@ import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ConverterModel; import org.richfaces.cdk.model.DescriptionGroup; +import org.richfaces.cdk.model.FacetModel; import org.richfaces.cdk.model.ModelElementBase; import org.richfaces.cdk.model.TagModel; import org.richfaces.cdk.model.ValidatorModel; @@ -33,6 +34,9 @@ @Inject private NamingConventions namingConventions; + + @Inject + private DescriptionProcessor descriptionProcessor; public SourceUtils getSourceUtils() { return this.sourceUtils.get(); @@ -79,38 +83,6 @@ } } - protected void setIcon(DescriptionGroup component, Description icon) { - if (null != icon && (!Strings.isEmpty(icon.smallIcon()) || !Strings.isEmpty(icon.largeIcon()))) { - DescriptionGroup.Icon iconValue = new DescriptionGroup.Icon(); - - if (!Strings.isEmpty(icon.smallIcon())) { - iconValue.setSmallIcon(icon.smallIcon()); - } - - if (!Strings.isEmpty(icon.largeIcon())) { - iconValue.setLargeIcon(icon.largeIcon()); - } - - component.setIcon(iconValue); - } - } - - protected void setDescription(DescriptionGroup component, Description description, String docComment) { - if (!Strings.isEmpty(docComment)) { - component.setDescription(docComment); - } - if (description != null) { - setIcon(component, description); - if (!Strings.isEmpty(description.displayName())) { - component.setDisplayname(description.displayName()); - } - if (!Strings.isEmpty(description.value())) { - component.setDescription(description.value()); - } - } - - } - protected void setClassNames(TypeElement componentElement, ModelElementBase modelElement, String generatedClass) { @@ -124,10 +96,6 @@ } - protected ClassName asClassDesctiption(TypeElement componentElement) { - return new ClassName(componentElement.getQualifiedName().toString()); - } - protected String getDocComment(TypeElement componentElement) { return null != componentElement ? getSourceUtils().getDocComment(componentElement) : null; } @@ -147,4 +115,8 @@ public void setNamingConventions(NamingConventions namingConventions) { this.namingConventions = namingConventions; } + + protected void setDescription(DescriptionGroup model, Description description, String docComment) { + descriptionProcessor.processDescription(model, description,docComment); + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -59,7 +59,7 @@ public PropertyBase getOrCreateAttribute(String attributeName) { PropertyBase attribute = getAttribute(attributeName); if (null == attribute) { - attribute = new Property(); + attribute = new PropertyModel(); attribute.setName(attributeName); attributes.add(attribute); } Modified: 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/Properties.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -33,14 +33,14 @@ * @author asmirnov(a)exadel.com */ public class Properties { - private List<? extends Property> properties = Lists.newArrayList(); + private List<? extends PropertyModel> properties = Lists.newArrayList(); /** * <p class="changed_added_4_0"></p> * * @return the properties */ - public List<? extends Property> getProperties() { + public List<? extends PropertyModel> getProperties() { return properties; } @@ -49,7 +49,7 @@ * * @param properties the properties to set */ - public void setProperties(List<? extends Property> properties) { + public void setProperties(List<? extends PropertyModel> properties) { this.properties = properties; } } Deleted: 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 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -1,33 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.model; - -/** - * That class represents JSF component property. - * @author asmirnov(a)exadel.com - * - */ -public class Property extends PropertyBase { - -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -336,6 +336,6 @@ @Override public String toString() { - return "Property {name: " + getName() + ", type: " + getType().getName() + "}"; + return "PropertyModel {name: " + getName() + ", type: " + getType().getName() + "}"; } } Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyModel.java (from rev 16721, 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/PropertyModel.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyModel.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + + +package org.richfaces.cdk.model; + +/** + * That class represents JSF component property. + * @author asmirnov(a)exadel.com + * + */ +public class PropertyModel extends PropertyBase { + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -37,7 +37,7 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.EventName; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.RenderKitModel; import org.richfaces.cdk.model.RendererModel; @@ -226,8 +226,8 @@ } } - private Property buildProperty(Attribute templateAttribute) { - Property rendererProperty = new Property(); + private PropertyModel buildProperty(Attribute templateAttribute) { + PropertyModel rendererProperty = new PropertyModel(); rendererProperty.setName(templateAttribute.getName()); rendererProperty.setDefaultValue(templateAttribute.getDefaultValue()); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -25,7 +25,7 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; import org.richfaces.cdk.model.AttributeModel; import javax.xml.bind.annotation.XmlElement; @@ -58,7 +58,7 @@ @Override @XmlElement(name = "property", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = PropertyBean.class) @XmlJavaTypeAdapter(PropertyAdapter.class) - public List<Property> getProperties() { + public List<PropertyModel> getProperties() { return super.getProperties(); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -29,7 +29,7 @@ import org.richfaces.cdk.model.EventModel; import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.FacetModel; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.TagModel; @@ -74,7 +74,7 @@ @Override @XmlElement(name = "property", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = PropertyBean.class) @XmlJavaTypeAdapter(PropertyAdapter.class) - public List<Property> getProperties() { + public List<PropertyModel> getProperties() { return super.getProperties(); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -24,7 +24,7 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; import org.richfaces.cdk.model.AttributeModel; import javax.xml.bind.annotation.XmlElement; @@ -60,7 +60,7 @@ @Override @XmlElement(name = "property", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = PropertyBean.class) @XmlJavaTypeAdapter(PropertyAdapter.class) - public List<Property> getProperties() { + public List<PropertyModel> getProperties() { return super.getProperties(); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementBeanBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementBeanBase.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementBeanBase.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -25,27 +25,28 @@ import com.google.common.collect.Lists; import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; import org.richfaces.cdk.model.PropertyBase; import java.util.ArrayList; import java.util.List; /** + * TODO - is the tho different collections are necessary ? * @author akolonitsky * @since Mar 19, 2010 */ public abstract class ElementBeanBase<E extends ConfigExtension> extends ExtensibleBean<E> { - private List<Property> properties = Lists.newArrayList(); + private List<PropertyModel> properties = Lists.newArrayList(); private List<AttributeModel> attributes = Lists.newArrayList(); - public List<Property> getProperties() { + public List<PropertyModel> getProperties() { return properties; } - public void setProperties(List<Property> properties) { + public void setProperties(List<PropertyModel> properties) { this.properties = properties; } @@ -66,8 +67,8 @@ public void setAllProperties(List<PropertyBase> allProperties) { for (PropertyBase propertyBase : allProperties) { - if (propertyBase instanceof Property) { - properties.add((Property) propertyBase); + if (propertyBase instanceof PropertyModel) { + properties.add((PropertyModel) propertyBase); } if (propertyBase instanceof AttributeModel) { attributes.add((AttributeModel) propertyBase); Modified: 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/PropertyAdapter.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -23,23 +23,23 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com * */ -public class PropertyAdapter extends AdapterBase<PropertyBean, Property> { +public class PropertyAdapter extends AdapterBase<PropertyBean, PropertyModel> { @Override - protected Class<? extends PropertyBean> getBeanClass(Property prop) { + protected Class<? extends PropertyBean> getBeanClass(PropertyModel prop) { return PropertyBean.class; } @Override - protected Class<? extends Property> getModelClass(PropertyBean bean) { - return Property.class; + protected Class<? extends PropertyModel> getModelClass(PropertyBean bean) { + return PropertyModel.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -24,7 +24,7 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; import org.richfaces.cdk.model.AttributeModel; import javax.xml.bind.annotation.XmlElement; @@ -59,7 +59,7 @@ @Override @XmlElement(name = "property", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = PropertyBean.class) @XmlJavaTypeAdapter(PropertyAdapter.class) - public List<Property> getProperties() { + public List<PropertyModel> getProperties() { return super.getProperties(); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -16,7 +16,7 @@ @XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(type = ClassName.class, value = ClassAdapter.class), @XmlJavaTypeAdapter(type = AttributeModel.class, value = AttributeAdapter.class), - @XmlJavaTypeAdapter(type = Property.class, value = PropertyAdapter.class), + @XmlJavaTypeAdapter(type = PropertyModel.class, value = PropertyAdapter.class), @XmlJavaTypeAdapter(type = FacesId.class, value = FacesIdAdapter.class), @XmlJavaTypeAdapter(type = ComponentLibrary.class, value = FacesConfigAdapter.class) }) @@ -31,5 +31,5 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyModel; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestRunner.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestRunner.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestRunner.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -130,7 +130,7 @@ return injector.getInstance(testClass); } - protected static final class FieldModule extends AbstractModule { + protected static final class FieldModule extends AbstractModule implements MockController { final Map<Field, Binding> fields; public FieldModule(Map<Field, Binding> fields) { @@ -140,7 +140,8 @@ @Override @SuppressWarnings("unchecked") protected void configure() { - + // Bind mock controllet to this instance, to automatically replay/verify all mocks created by runner. + bind(MockController.class).toInstance(this); // map field values by type for (Field field : fields.keySet()) { TypeLiteral literal = TypeLiteral.get(field.getGenericType()); @@ -185,6 +186,24 @@ } } } + + @Override + public void replay() { + for (Binding field : fields.values()) { + if(null != field.value){ + EasyMock.replay(field.value); + } + } + } + + @Override + public void verify() { + for (Binding field : fields.values()) { + if(null != field.value){ + EasyMock.verify(field.value); + } + } + } } protected static final class Binding { @@ -195,7 +214,7 @@ private Map<Field, Binding> getMockValues(Set<Field> testFields) { Map<Field, Binding> mocksAndStubs = new HashMap<Field, Binding>(); - + // TODO - create annotation attribute that tells runner to use the scme Mock Controller to create related mocks. for (Field field : testFields) { if (field.getAnnotation(Mock.class) != null) { Binding bind = new Binding(); Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/MockController.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/MockController.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/MockController.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk; + +/** + * <p class="changed_added_4_0">Instance of an Object implemented this interface can be injected into test class to simplify mock objects manipulations.</p> + * @author asmirnov(a)exadel.com + * + */ +public interface MockController { + + /** + * <p class="changed_added_4_0">Repaly all mock objects created by the {@link CdkTestRunner}</p> + */ + public void replay(); + + /** + * <p class="changed_added_4_0">Verify all mock objects created by the {@link CdkTestRunner}</p> + */ + public void verify(); + +} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/MockController.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -0,0 +1,120 @@ +/* + * $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.apt.processors; + +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; + +import java.util.Collections; + +import javax.lang.model.element.TypeElement; + +import org.easymock.EasyMock; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.richfaces.cdk.CdkTestRunner; +import org.richfaces.cdk.Mock; +import org.richfaces.cdk.MockController; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.apt.SourceUtils; +import org.richfaces.cdk.apt.SourceUtils.BeanProperty; +import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor; +import org.richfaces.cdk.model.BeanModelBase; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.PropertyModel; +import org.richfaces.cdk.xmlconfig.CdkEntityResolver; +import org.richfaces.cdk.xmlconfig.JAXB; +import org.richfaces.cdk.xmlconfig.model.Fragment; + +import com.google.inject.Inject; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +(a)RunWith(CdkTestRunner.class) +public class AttributesProcessorTest extends AnnotationProcessorTest { + + private static final String FOO = "foo"; + + private static final String FOO_XML = "foo.xml"; + + @Inject + private MockController mockController; + + @Inject + private AttributesProcessorImpl processor; + + @Mock + private DescriptionProcessor descriptionProcessor; + + @Mock + private JAXB xmlProcessor; + + @Mock + private SourceUtils utils; + /** + * Test method for {@link org.richfaces.cdk.apt.processors.AttributesProcessorImpl#processType(org.richfaces.cdk.model.BeanModelBase, javax.lang.model.element.TypeElement)}. + */ + @Test + public void testProcessType() { + BeanModelBase bean = new BeanModelBase(); + TypeElement element = createMock(TypeElement.class); + utils.visitSupertypes(same(element), EasyMock.isA(SuperTypeVisitor.class)); + expectLastCall(); + BeanProperty beanProperty = createNiceMock(BeanProperty.class); + expect(utils.getBeanPropertiesAnnotatedWith(eq(Attribute.class), same(element))).andReturn(Collections.singleton(beanProperty)); + expect(utils.getAbstractBeanProperties(element)).andReturn(Collections.<BeanProperty>emptySet()); + expect(beanProperty.getName()).andReturn(FOO); + expect(beanProperty.getType()).andReturn(ClassName.parseName(String.class.getName())); + mockController.replay();replay(element,beanProperty); + processor.processType(bean, element); + mockController.verify();verify(element,beanProperty); + assertEquals(1, bean.getAttributes().size()); + } + + /** + * Test method for {@link org.richfaces.cdk.apt.processors.AttributesProcessorImpl#processXmlFragment(org.richfaces.cdk.model.BeanModelBase, java.lang.String[])}. + */ + @Test + public void testProcessXmlFragment() { + BeanModelBase bean = new BeanModelBase(); + Fragment fragment = new Fragment(); + PropertyModel propertyModel = new PropertyModel(); + propertyModel.setName(FOO); + fragment.getProperties().add(propertyModel ); + expect(xmlProcessor.unmarshal(eq(CdkEntityResolver.URN_ATTRIBUTES+FOO_XML), (String)anyObject(), eq(Fragment.class))).andReturn(fragment); + mockController.replay(); + processor.processXmlFragment(bean, FOO_XML); + mockController.verify(); + assertEquals(1, bean.getAttributes().size()); + } + + @Override + protected Iterable<String> sources() { + return Collections.emptySet(); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -105,6 +105,9 @@ @Stub @Source(Sources.RENDERER_TEMPLATES) private FileManager sources; + + @Stub + private DescriptionProcessor descriptionProcessor; /** * Test method for @@ -187,29 +190,7 @@ assertNull( model.getFamily()); } - @Test - public void testSetIcon() throws Exception { - Description icon = createMock(Description.class); - expect(icon.largeIcon()).andReturn(LARGE_GIF).atLeastOnce(); - expect(icon.smallIcon()).andReturn(SMALL_JPG).atLeastOnce(); - replay(log, utils, componentElement, jaxb, annotation,icon); - processor.setIcon(model, icon); - verify(log, utils, componentElement, jaxb,annotation,icon ); - assertNotNull(model.getIcon()); - assertEquals(LARGE_GIF, model.getIcon().getLargeIcon()); - assertEquals(SMALL_JPG, model.getIcon().getSmallIcon()); - } - @Test - public void testSetIcon1() throws Exception { - Description icon = createMock(Description.class); - expect(icon.largeIcon()).andReturn("").atLeastOnce(); - expect(icon.smallIcon()).andReturn("").atLeastOnce(); - replay(log, utils, componentElement, jaxb, annotation,icon); - processor.setIcon(model, icon); - verify(log, utils, componentElement, jaxb,annotation,icon ); - assertNull(model.getIcon()); - } @Test public void testProcessFacetsFromProperty() throws Exception { @@ -222,10 +203,10 @@ expect(property.isExists()).andReturn(true); expect(facet.description()).andReturn(description); expect(facet.generate()).andReturn(true); - expect(this.description.smallIcon()).andReturn(""); - expect(this.description.largeIcon()).andReturn(""); - expect(this.description.displayName()).andReturn("fooFacet").times(2); - expect(this.description.value()).andReturn(""); +// expect(this.description.smallIcon()).andReturn(""); +// expect(this.description.largeIcon()).andReturn(""); +// expect(this.description.displayName()).andReturn("fooFacet").times(2); +// expect(this.description.value()).andReturn(""); replay(log, utils, componentElement, jaxb, annotation,property,facet,description); processor.processFacets(componentElement, model, annotation); verify(log, utils, componentElement, jaxb,annotation,property,facet,description); @@ -233,9 +214,9 @@ FacetModel facetModel = Iterables.getOnlyElement(model.getFacets()); assertTrue(facetModel.isGenerate()); assertEquals("foo", facetModel.getName()); - assertEquals("my comment", facetModel.getDescription()); - assertEquals("fooFacet", facetModel.getDisplayname()); - assertNull(facetModel.getIcon()); +// assertEquals("my comment", facetModel.getDescription()); +// assertEquals("fooFacet", facetModel.getDisplayname()); +// assertNull(facetModel.getIcon()); } @Test public void testProcessFacetsFromAnnotation() throws Exception { @@ -245,10 +226,10 @@ expect(facet.name()).andReturn("foo"); expect(facet.description()).andReturn(this.description); expect(facet.generate()).andReturn(true); - expect(this.description.smallIcon()).andReturn(""); - expect(this.description.largeIcon()).andReturn(""); - expect(this.description.displayName()).andReturn("fooFacet").times(2); - expect(this.description.value()).andReturn(""); +// expect(this.description.smallIcon()).andReturn(""); +// expect(this.description.largeIcon()).andReturn(""); +// expect(this.description.displayName()).andReturn("fooFacet").times(2); +// expect(this.description.value()).andReturn(""); replay(log, utils, componentElement, jaxb, annotation,property,facet,description); processor.processFacets(componentElement, model, annotation); verify(log, utils, componentElement, jaxb,annotation,property,facet,description); @@ -257,8 +238,8 @@ assertTrue(facetModel.isGenerate()); assertEquals("foo", facetModel.getName()); // assertEquals("my comment", facetModel.getDescription()); - assertEquals("fooFacet", facetModel.getDisplayname()); - assertNull(facetModel.getIcon()); +// assertEquals("fooFacet", facetModel.getDisplayname()); +// assertNull(facetModel.getIcon()); } Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/DescriptionProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/DescriptionProcessorTest.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/DescriptionProcessorTest.java 2010-04-06 00:29:33 UTC (rev 16722) @@ -0,0 +1,85 @@ +/* + * $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.apt.processors; + +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; + +import java.util.Collections; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.richfaces.cdk.CdkTestRunner; +import org.richfaces.cdk.Mock; +import org.richfaces.cdk.MockController; +import org.richfaces.cdk.annotations.Description; +import org.richfaces.cdk.model.DescriptionGroup; + +import com.google.inject.Inject; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +(a)RunWith(CdkTestRunner.class) +public class DescriptionProcessorTest extends AnnotationProcessorTest { + + private static final String FOO_FACET = "fooFacet"; + + private static final String FOO_BAR_ELEMENT = "Foo bar element"; + + @Inject + private MockController mockController; + + @Inject + private DescriptionProcessorImpl descriptionProcessor; + + @Mock + private Description description; + + @Mock + private DescriptionGroup bean; + /** + * Test method for {@link org.richfaces.cdk.apt.processors.DescriptionProcessorImpl#processDescription(org.richfaces.cdk.model.DescriptionGroup, org.richfaces.cdk.annotations.Description, java.lang.String)}. + */ + @Test + public void testProcessDescription() { + bean.setDescription(FOO_BAR_ELEMENT);expectLastCall(); + bean.setDisplayname(FOO_FACET);expectLastCall(); + expect(this.description.smallIcon()).andReturn(""); + expect(this.description.largeIcon()).andReturn(""); + expect(this.description.displayName()).andReturn(FOO_FACET).times(2); + expect(this.description.value()).andReturn(""); + mockController.replay(); + descriptionProcessor.processDescription(bean, description,FOO_BAR_ELEMENT); + mockController.verify(); + } + + @Override + protected Iterable<String> sources() { + return Collections.emptySet(); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/DescriptionProcessorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/.svnignore ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/UITestCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/event/TestEvent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/verify.bsh ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/settings.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/pom.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/config/faces-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/component/AbstractTestPanel.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/AbstractTestPanelRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/SimpleTestRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/verify.bsh ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenLogger.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractCDKMojo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractGenerateMojo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/CompileMojo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Library.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Renderkit.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/SkinInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Taglib.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/mdo/resource-config.mdo ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/VM_global_library.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/component/UIClass.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/component/config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/component/template.jspx ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/archetype/src/main/java/images/BaseImage.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/archetype/src/main/resources/images/README.txt ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/archetype/src/test/java/images/BaseImageTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/core.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/editor.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-slider.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/layout.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/list-shuttle.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/ordering-list.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/paint2d.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelmenu.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/pick-list.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/extclasses/extended.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/extclasses/extended_classes.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/skin.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/skin/skin.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/component-dependencies.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/faces-config.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/resources-config.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/taglib.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/tld.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates/xcss.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/faces-config.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/resources-config.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/taglib.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/tld.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/templates12/xcss.vm ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/component/theme.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/site/apt/index.apt ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/site/apt/usage.apt ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/site/resources/images/exadel_logo.jpg ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/site/site.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/xinclude/pom.xml =================================================================== --- root/cdk/trunk/plugins/xinclude/pom.xml 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/xinclude/pom.xml 2010-04-06 00:29:33 UTC (rev 16722) @@ -14,7 +14,7 @@ the specific language governing permissions and limitations under the License. --> - <!-- $Id: pom.xml 699337 2008-09-26 14:24:57Z reinhard $ --> + <!-- $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Property changes on: root/cdk/trunk/plugins/xinclude/pom.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/ProcessingException.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/SAXConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/PointerPart.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/ShorthandPart.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/UnsupportedPart.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerPart.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XmlnsPart.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMStreamer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMUtils.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/ElementInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/main/javacc/xpointer-fw.jj ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/test/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformerTest.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/just-text.txt ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/xinclude/src/test/resources/test.xml =================================================================== --- root/cdk/trunk/plugins/xinclude/src/test/resources/test.xml 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/xinclude/src/test/resources/test.xml 2010-04-06 00:29:33 UTC (rev 16722) @@ -15,5 +15,5 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!-- $Id: test.xml 701981 2008-10-06 08:04:01Z reinhard $ --> +<!-- $Id$ --> <test/> \ No newline at end of file Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/test.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/xinclude/src/test/resources/test.xslt =================================================================== --- root/cdk/trunk/plugins/xinclude/src/test/resources/test.xslt 2010-04-05 19:04:09 UTC (rev 16721) +++ root/cdk/trunk/plugins/xinclude/src/test/resources/test.xslt 2010-04-06 00:29:33 UTC (rev 16722) @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!-- $Id: test.xslt 734169 2009-01-13 16:20:05Z stevendolg $ --> +<!-- $Id$ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:param name="myParam" /> Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/test.xslt ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-deprecated_xpointer.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-fallback.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-text-only.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-xml.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Property changes on: root/cdk/trunk/plugins/xinclude/src/test/resources/xinclude-xpointer.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id