Author: alexsmirnov Date: 2009-05-19 18:58:34 -0400 (Tue, 19 May 2009) New Revision: 14245 Added: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceType.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBeanEntry.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigParser.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesDependenciesGenerator.java branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/resources-dependencies.vm branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/resources-dependencies.vm branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/editor.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/layout.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates/component-dependencies.vm branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties branches/jsf2.0/cdk/maven-resource-dependency-plugin/ Removed: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/columns.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/component-control.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/effect.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/functions.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/insert.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/j-query.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-model.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-table.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ConverterBean.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagTestClassHolder.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TestClassHolder.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ValidatorBean.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ComponentTestGenerator.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TagTestGenerator.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator2.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodyMerge.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodySerializer.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XPathComparator.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/AjaxRenderedAreaElement.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_output_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_control_events.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_events.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyMergeTest.java branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodySerializerTest.java branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XPathComparatorTest.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/MavenXMLMerge.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/VelocityTaglibMergeCallBack.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/XMLMergeCallback.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CompileMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateTestMojo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/SkinInfo.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/velocity/ResourceLoader.java branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/core.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-slider.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/list-shuttle.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/ordering-list.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/paint2d.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelmenu.xcss branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/pick-list.xcss branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/Aggregation.java branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/ErrorReporter4Mojo.java branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintChecker.java branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintMojo.java branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/MojoSupport.java branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/SourceFile.java branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java branches/jsf2.0/cdk/maven-javascript-plugin/src/test/java/net/sf/alchim/mojo/yuicompressor/AggregationTestCase.java branches/jsf2.0/cdk/maven-resource-dependency-plugin/pom.xml branches/jsf2.0/framework/jsf-test/pom.xml Log: merge CDK from 3.3.1.GA Update Jsf-test dependencies Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.config; import java.beans.PropertyDescriptor; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ConverterBean.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ConverterBean.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ConverterBean.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.config; public class ConverterBean extends ComponentBaseBean { Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagTestClassHolder.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagTestClassHolder.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagTestClassHolder.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.config; /** Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TestClassHolder.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TestClassHolder.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TestClassHolder.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.config; /** Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ValidatorBean.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ValidatorBean.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ValidatorBean.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.config; public class ValidatorBean extends ComponentBaseBean { Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -33,8 +33,10 @@ import net.sf.cglib.core.MethodInfo; import net.sf.cglib.core.ReflectUtils; import net.sf.cglib.core.Signature; +import net.sf.cglib.proxy.Callback; import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.NoOp; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Constants; @@ -46,35 +48,34 @@ * */ public class AbstractClassStubBuilder { - public static <T> T buildStub(final Class<T> clazz, MethodInterceptor interceptor, - ClassLoader classLoader) { + + public static Object buildInterfaceStub(final Class<?> clazz, ClassLoader classLoader) throws InstantiationException, IllegalAccessException { Enhancer enhancer = new Enhancer() { - @Override public void generateClass(ClassVisitor v) throws Exception { - ClassEmitter ce = new ClassEmitter(v); - ce.begin_class(Constants.V1_4, - Constants.ACC_PUBLIC, - getClassName(), - Type.getType(clazz), - null, - null); - EmitUtils.null_constructor(ce); - List methods = new ArrayList(); - getMethods(clazz, null, methods); - - for (Iterator iterator = methods.iterator(); iterator - .hasNext();) { + ClassEmitter ce = new ClassEmitter(v); + ce.begin_class(Constants.V1_5, + Constants.ACC_PUBLIC, + getClassName(), + null, + new Type[]{Type.getType(clazz)}, + null); + EmitUtils.null_constructor(ce); + List methods = new ArrayList(); + getMethods(Object.class, new Class[]{clazz}, methods); + + for (Iterator iterator = methods.iterator(); iterator + .hasNext();) { Method method = (Method) iterator.next(); - + if (Modifier.isAbstract(method.getModifiers())) { MethodInfo methodInfo = ReflectUtils.getMethodInfo(method); Signature signature = methodInfo.getSignature(); Type returnType = signature.getReturnType(); - + CodeEmitter e = ce.begin_method(method.getModifiers() & ~Modifier.ABSTRACT, signature, methodInfo.getExceptionTypes(), methodInfo.getAttribute()); - + e.zero_or_null(returnType); e.return_value(); @@ -85,23 +86,88 @@ size += argumentTypes[i].getSize(); } } - + // 1 is for this e.visitMaxs(returnType.getSize(), size + 1); - + e.end_method(); } - } - - ce.end_class(); + } + + ce.end_class(); } }; - enhancer.setSuperclass(clazz); - enhancer.setCallbackType(MethodInterceptor.class); + + enhancer.setCallbackType(NoOp.class); + enhancer.setInterfaces(new Class[]{clazz}); enhancer.setClassLoader(classLoader != null ? classLoader : clazz.getClassLoader()); - Class<T> instrumentedClass = enhancer.createClass(); + return enhancer.createClass().newInstance(); + } + + public static <T> T buildStub(final Class<T> clazz, MethodInterceptor interceptor, + ClassLoader classLoader) { + Class<T> instrumentedClass; + + if ((Modifier.ABSTRACT & clazz.getModifiers()) != 0) { + Enhancer enhancer = new Enhancer() { + @Override + public void generateClass(ClassVisitor v) throws Exception { + ClassEmitter ce = new ClassEmitter(v); + ce.begin_class(Constants.V1_5, + Constants.ACC_PUBLIC, + getClassName(), + Type.getType(clazz), + null, + null); + EmitUtils.null_constructor(ce); + List methods = new ArrayList(); + getMethods(clazz, null, methods); + + for (Iterator iterator = methods.iterator(); iterator + .hasNext();) { + Method method = (Method) iterator.next(); + + if (Modifier.isAbstract(method.getModifiers())) { + MethodInfo methodInfo = ReflectUtils.getMethodInfo(method); + Signature signature = methodInfo.getSignature(); + Type returnType = signature.getReturnType(); + + CodeEmitter e = ce.begin_method(method.getModifiers() & ~Modifier.ABSTRACT, + signature, methodInfo.getExceptionTypes(), + methodInfo.getAttribute()); + + e.zero_or_null(returnType); + e.return_value(); + + Type[] argumentTypes = methodInfo.getSignature().getArgumentTypes(); + int size = 0; + if (argumentTypes != null) { + for (int i = 0; i < argumentTypes.length; i++) { + size += argumentTypes[i].getSize(); + } + } + + // 1 is for this + e.visitMaxs(returnType.getSize(), size + 1); + + e.end_method(); + } + } + + ce.end_class(); + } + }; + enhancer.setSuperclass(clazz); + enhancer.setCallbackType(MethodInterceptor.class); + enhancer.setClassLoader(classLoader != null ? + classLoader : clazz.getClassLoader()); + instrumentedClass = enhancer.createClass(); + } else { + instrumentedClass = clazz; + } + Enhancer enhancer2 = new Enhancer(); enhancer2.setSuperclass(instrumentedClass); enhancer2.setCallback(interceptor); @@ -111,3 +177,4 @@ } } + Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ComponentTestGenerator.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ComponentTestGenerator.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ComponentTestGenerator.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.generator; import java.io.BufferedWriter; Copied: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceType.java (from rev 14244, branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceType.java) =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceType.java (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceType.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,30 @@ +/** + * 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.ajax4jsf.builder.generator; + +/** + * @author Nick Belaevski + * @since 3.3.0 + */ +public enum ResourceType { + SCRIPT, STYLE +} + Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -23,38 +23,22 @@ import java.io.BufferedWriter; import java.io.File; -import java.io.FileInputStream; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.StringReader; import java.io.Writer; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.List; +import java.util.Map; import java.util.Set; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import net.sf.cglib.proxy.MethodInterceptor; -import net.sf.cglib.proxy.MethodProxy; - import org.ajax4jsf.builder.config.BuilderConfig; -import org.ajax4jsf.builder.config.ComponentBean; -import org.ajax4jsf.builder.config.RendererBean; -import org.ajax4jsf.templatecompiler.builder.CompilationContext; -import org.ajax4jsf.templatecompiler.builder.CompilationException; -import org.ajax4jsf.templatecompiler.builder.TemplateCompiler; -import org.ajax4jsf.templatecompiler.elements.RootElement; -import org.ajax4jsf.templatecompiler.elements.TemplateElement; -import org.ajax4jsf.templatecompiler.elements.vcp.FResourceTemplateElement; -import org.ajax4jsf.templatecompiler.elements.vcp.HeaderResourceElement; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.xml.sax.Attributes; @@ -63,254 +47,68 @@ import org.xml.sax.helpers.DefaultHandler; /** - * @author Nick - mailto:nbelaevski@exadel.com - * created 17.04.2007 + * @author Nick - mailto:nbelaevski@exadel.com created 17.04.2007 * */ public class ResourcesConfigGenerator extends FacesConfigGenerator { private File resourcesConfig; private File templatesDirectory; - - private static final SAXParserFactory parserFactory = SAXParserFactory.newInstance(); + private ResourcesConfigGeneratorBean resourcesConfigGeneratorBean; + private static final SAXParserFactory parserFactory = SAXParserFactory + .newInstance(); + public ResourcesConfigGenerator(JSFGeneratorConfiguration task, Logger log) { super(task, log); } - private void addResources(ResourcesConfigGeneratorBean configBean, TemplateElement templateElement, - String packageName, RendererBean renderer, BuilderConfig builderConfig) throws ClassNotFoundException { - if (templateElement instanceof FResourceTemplateElement) { - FResourceTemplateElement resourceTemplateElement = (FResourceTemplateElement) templateElement; - String name = resourceTemplateElement.getName(); - - addResource(name, packageName, configBean); - } else if (templateElement instanceof RootElement) { - RootElement rootElement = (RootElement) templateElement; - - CompilationContext compilationContext = rootElement.getComponentBean(); - - String classname = renderer.getClassname(); - int idx = classname.lastIndexOf('.'); - if (idx != -1) { - packageName = classname.substring(0, idx); - } else { - packageName = ""; - } - - ClassLoader loader = builderConfig.getLoader(); - Class cl = null; - + private void parseXCSSResource(String resourcePath, + final ResourcesConfigGeneratorBean bean) throws SAXException, + IOException, ParserConfigurationException { + InputStream resourceStream = getClassLoader().getResourceAsStream( + resourcePath); + if (resourceStream != null) { + debug("XCSS file exists in classpath"); + try { - cl = loader.loadClass(classname); - } catch (ClassNotFoundException e) { - String superclass = compilationContext.getBaseclassPackageName() + "." + compilationContext.getBaseclassName(); - if (superclass != null) { - cl = loader.loadClass(superclass); - } - } + SAXParser parser = parserFactory.newSAXParser(); + parser.parse(resourceStream, new DefaultHandler() { + @Override + public void startElement(String uri, String localName, + String name, Attributes attributes) + throws SAXException { - if (cl != null) { - GetResourceInterceptor interceptor = new GetResourceInterceptor(); - Object instance = AbstractClassStubBuilder.buildStub(cl, interceptor, - builderConfig.getLoader()); - - try { - Method method = null; - Object object = null; - - Class<?> cl1 = instance.getClass(); - while (cl1 != null && method == null) { - try { - method = cl1.getDeclaredMethod("getStyles", null); - } catch (NoSuchMethodException e) { - cl1 = cl1.getSuperclass(); - } - } - - if (method != null) { - method.setAccessible(true); - object = method.invoke(instance, null); - List<String> list = interceptor.getList(); - if (list != null) { - for (String name : list) { - addResource(name, packageName, configBean); - } - } - } - - interceptor.clearList(); + super.startElement(uri, localName, name, attributes); - method = null; - cl1 = instance.getClass(); - while (cl1 != null && method == null) { - try { - method = cl1.getDeclaredMethod("getScripts", null); - } catch (NoSuchMethodException e) { - cl1 = cl1.getSuperclass(); - } - } - - if (method != null) { - method.setAccessible(true); - object = method.invoke(instance, null); - List<String> list = interceptor.getList(); - if (list != null) { - for (String name : list) { - addResource(name, packageName, configBean); + if ("f:resource".equals(name)) { + String value = attributes.getValue("f:key"); + + if (value != null) { + debug("Adding resource: " + value); + + bean.addResource(value, "", null, true); } } } - } catch (SecurityException e) { - builderConfig.getLog().error(e.getMessage(), e); - } catch (IllegalArgumentException e) { - builderConfig.getLog().error(e.getMessage(), e); - } catch (IllegalAccessException e) { - builderConfig.getLog().error(e.getMessage(), e); - } catch (InvocationTargetException e) { - builderConfig.getLog().error(e.getMessage(), e); + }); + + } finally { + try { + resourceStream.close(); + } catch (IOException e) { + getLog().error(e.getLocalizedMessage(), e); } } - } else if (templateElement instanceof HeaderResourceElement) { - HeaderResourceElement resourceElement = (HeaderResourceElement) templateElement; - String[] paths = resourceElement.getResourcePaths(); - if (paths != null) { - for (int i = 0; i < paths.length; i++) { - String string = paths[i]; - - addResource(string, packageName, configBean); - } - } - } - - ArrayList<TemplateElement> subElements = templateElement.getSubElements(); - for (TemplateElement element : subElements) { - addResources(configBean, element, packageName, renderer, builderConfig); - } - } - - private void addResource(String name, String packageName, - ResourcesConfigGeneratorBean configBean) { - - String resolvedPath = resolveResourcePath(name, packageName); - // remove leading / from resource name. - if(name.startsWith("/")){ - name = name.substring(1); - } - if (resolvedPath != null) { - configBean.addPathResource(name, resolvedPath); } else { - //couldn't resolve, treat as class name - configBean.addClassResource(name, name); + getLog().error("Resource " + resourcePath + " hasn't been found!"); } } - - private String resolveResourcePath(String name, String packageName) { - if (name.contains("/")) { - String resolvedName; - if (!name.startsWith("/")) { - //need to resolve - StringBuffer normalizedName = new StringBuffer(); - normalizedName.append(packageName.replace('.', '/')); - - if (!packageName.endsWith("/")) { - normalizedName.append('/'); - } - - normalizedName.append(name); - - resolvedName = normalizedName.toString(); - } else { - if (name.length() > 0) { - resolvedName = name.substring(1); - } else { - resolvedName = null; - } - } - - return resolvedName; - } - - return null; - } - - private void addResources(ResourcesConfigGeneratorBean configBean, RendererBean renderer, BuilderConfig builderConfig) throws CompilationException, IOException, ClassNotFoundException { - if (null != renderer && renderer.isGenerate() - && null != renderer.getTemplate()) { - - File template; - if (null != getTemplates()) { - template = new File(getTemplates(), renderer.getTemplate()); - } else { - template = new File(renderer.getTemplate()); - } - CompilationContext rendererBean = new RendererCompilationContext( - getLog(), getClassLoader(),getConfig()); - - TemplateCompiler templateCompiler = new TemplateCompiler(); - InputStream templateStream = new FileInputStream(template); - templateCompiler.processing(templateStream, rendererBean); - - TemplateElement root = rendererBean.getTree(); - - String classname = renderer.getClassname(); - String packageName; - int idx = classname.lastIndexOf('.'); - if (idx != -1) { - packageName = classname.substring(0, idx); - } else { - packageName = ""; - } - - addResources(configBean, root, packageName, renderer, builderConfig); - } - } - - private void parseXCSSResource(String resourcePath, final ResourcesConfigGeneratorBean bean) throws SAXException, IOException, ParserConfigurationException { - InputStream resourceStream = getClassLoader().getResourceAsStream(resourcePath); - if (resourceStream != null) { - debug("XCSS file exists in classpath"); - - try { - SAXParser parser = parserFactory.newSAXParser(); - parser.parse(resourceStream, new DefaultHandler() { - @Override - public void startElement(String uri, - String localName, String name, - Attributes attributes) - throws SAXException { - - super.startElement(uri, localName, name, attributes); - - if ("f:resource".equals(name)) { - String value = attributes.getValue("f:key"); - - if (value != null) { - debug("Adding resource: " + value); - - addResource(value, "", bean); - } - } - } - }); - - } finally { - try { - resourceStream.close(); - } catch (IOException e) { - getLog().error(e.getLocalizedMessage(), e); - } - } - } else { - getLog().error("Resource " + resourcePath + " hasn't been found!"); - } - } - private boolean isXCSSPath(String resourcePath) { - return resourcePath != null && resourcePath.endsWith(".xcss"); + return resourcePath != null && resourcePath.endsWith(".xcss"); } - + public void createFiles(BuilderConfig config) throws GeneratorException { VelocityContext context = new VelocityContext(); Template template = getTemplate(); @@ -318,86 +116,107 @@ // Put common properties final ResourcesConfigGeneratorBean bean = new ResourcesConfigGeneratorBean(); - - List<ComponentBean> components = config.getComponents(); - for (ComponentBean componentBean : components) { - RendererBean rendererBean = componentBean.getRenderer(); - - addResources(bean, rendererBean, config); + if (this.resourcesConfigGeneratorBean != null) { + bean.merge(resourcesConfigGeneratorBean); } - - List<RendererBean> renderers = config.getRenderers(); - for (RendererBean rendererBean : renderers) { - addResources(bean, rendererBean, config); - } - + String includedContent = getIncludeContent(); if (includedContent != null && includedContent.length() != 0) { - String parseableContent = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><resource-config>" + includedContent + - "</resource-config>"; + String parseableContent = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><resource-config>" + + includedContent + "</resource-config>"; SAXParser parser = parserFactory.newSAXParser(); - parser.parse(new InputSource(new StringReader(parseableContent)), new DefaultHandler() { - private StringBuilder path; - - @Override - public void startElement(String uri, - String localName, String name, - Attributes attributes) - throws SAXException { + parser.parse( + new InputSource(new StringReader(parseableContent)), + new DefaultHandler() { + private StringBuilder path; - super.startElement(uri, localName, name, attributes); - - if ("path".equals(name)) { - this.path = new StringBuilder(); - } - } - - public void characters(char[] ch, int start, int length) throws SAXException { - if (this.path != null) { - this.path.append(ch, start, length); - } - }; - - @Override - public void endElement(String uri, String localName, String name) throws SAXException { - super.endElement(uri, localName, name); + @Override + public void startElement(String uri, + String localName, String name, + Attributes attributes) throws SAXException { - if ("resource".equals(name)) { - if (this.path != null && this.path.length() != 0) { - String resourcePath = this.path.toString().trim(); - if (isXCSSPath(resourcePath)) { - debug("XCSS file detected: " + resourcePath); - try { - parseXCSSResource(resourcePath, bean); - } catch (IOException e) { - throw new SAXException(e.getLocalizedMessage(), e); - } catch (ParserConfigurationException e) { - throw new SAXException(e.getLocalizedMessage(), e); + super.startElement(uri, localName, name, + attributes); + + if ("path".equals(name)) { + this.path = new StringBuilder(); + } } - } - } - this.path = null; - } - } - }); + + public void characters(char[] ch, int start, + int length) throws SAXException { + if (this.path != null) { + this.path.append(ch, start, length); + } + }; + + @Override + public void endElement(String uri, + String localName, String name) + throws SAXException { + super.endElement(uri, localName, name); + + if ("resource".equals(name)) { + if (this.path != null + && this.path.length() != 0) { + String resourcePath = this.path + .toString().trim(); + if (isXCSSPath(resourcePath)) { + debug("XCSS file detected: " + + resourcePath); + try { + parseXCSSResource(resourcePath, + bean); + } catch (IOException e) { + throw new SAXException(e + .getLocalizedMessage(), + e); + } catch (ParserConfigurationException e) { + throw new SAXException(e + .getLocalizedMessage(), + e); + } + } + } + this.path = null; + } + } + }); } + + Set<String> pathResourcesSet = new LinkedHashSet<String>(); + for (ResourcesConfigGeneratorBeanEntry entry : bean.getDependencies()) { + if (entry.isPathResource()) { + pathResourcesSet.add(entry.getPath()); + } + } - Set<String> pathResourcesSet = new LinkedHashSet<String>(bean.getPathResources().values()); for (Iterator<String> iterator = pathResourcesSet.iterator(); iterator .hasNext();) { String resourcePath = iterator.next(); - + if (isXCSSPath(resourcePath)) { - debug("XCSS file detected: " + resourcePath); - parseXCSSResource(resourcePath, bean); + debug("XCSS file detected: " + resourcePath); + parseXCSSResource(resourcePath, bean); } } + + Map<String, String> classResources = new HashMap<String, String>(); + Map<String, String> pathResources = new HashMap<String, String>(); - context.put("classResources", bean.getClassResources()); - context.put("pathResources", bean.getPathResources()); - context.put("resourcesConfig", this); + for (ResourcesConfigGeneratorBeanEntry entry : bean.getDependencies()) { + if (entry.isPathResource()) { + pathResources.put(entry.getName(), entry.getPath()); + } else { + classResources.put(entry.getName(), entry.getPath()); + } + } + context.put("classResources", classResources); + context.put("pathResources", pathResources); + context.put("resourcesConfig", this); + File configFile = getResourcesConfig(); File javaDir = configFile.getParentFile(); if (!javaDir.exists()) { @@ -411,8 +230,8 @@ out.flush(); out.close(); } catch (Exception e) { - throw new GeneratorException("Error create new resources-config.xml ", - e); + throw new GeneratorException( + "Error create new resources-config.xml ", e); } } @@ -439,36 +258,13 @@ public File getTemplates() { return this.templatesDirectory; } -} - -class GetResourceInterceptor implements MethodInterceptor { - - private static final Class<?>[] SIGNATURE = new Class<?>[] { - String.class - }; - private List<String> list = new ArrayList<String>(); - - public List<String> getList() { - return list; + public void setResourcesConfigGeneratorBean( + ResourcesConfigGeneratorBean resourcesConfigGeneratorBean) { + this.resourcesConfigGeneratorBean = resourcesConfigGeneratorBean; } - public void clearList() { - list.clear(); + public ResourcesConfigGeneratorBean getResourcesConfigGeneratorBean() { + return resourcesConfigGeneratorBean; } - - public Object intercept(Object instance, Method method, Object[] args, - MethodProxy methodProxy) throws Throwable { - - if ("getResource".equals(method.getName()) && - Arrays.equals(SIGNATURE, method.getParameterTypes())) { - - list.add((String) args[0]); - - return null; - } else { - return methodProxy.invokeSuper(instance, args); - } - } - } \ No newline at end of file Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -21,33 +21,73 @@ package org.ajax4jsf.builder.generator; -import java.util.HashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; - - /** * @author Nick - mailto:nbelaevski@exadel.com * created 17.04.2007 * */ public class ResourcesConfigGeneratorBean { - private HashMap<String, String> classResources = new HashMap<String, String>(); - private HashMap<String, String> pathResources = new HashMap<String, String>(); - public void addClassResource(String name, String className) { - classResources.put(name, className); - } + private List<ResourcesConfigGeneratorBeanEntry> dependencies = new ArrayList<ResourcesConfigGeneratorBeanEntry>(); + + private String resolveResourcePath(String name, String packageName) { + if (name.contains("/")) { + String resolvedName; - public void addPathResource(String name, String path) { - pathResources.put(name, path); + if (!name.startsWith("/")) { + // need to resolve + StringBuffer normalizedName = new StringBuffer(); + normalizedName.append(packageName.replace('.', '/')); + + if (!packageName.endsWith("/")) { + normalizedName.append('/'); + } + + normalizedName.append(name); + + resolvedName = normalizedName.toString(); + } else { + if (name.length() > 0) { + resolvedName = name.substring(1); + } else { + resolvedName = null; + } + } + + return resolvedName; + } + + return null; } - public Map<String, String> getClassResources() { - return classResources; + public void addResource(String name, String path, ResourceType type, boolean isDerived) { + boolean isPathResource = true; + String resolvedPath = resolveResourcePath(name, path); + + // remove leading / from resource name. + if (name.startsWith("/")) { + name = name.substring(1); + } + + if (resolvedPath == null) { + // couldn't resolve, treat as class name + resolvedPath = name; + isPathResource = false; + } + + this.dependencies.add( + new ResourcesConfigGeneratorBeanEntry( + name, resolvedPath, isPathResource, type, isDerived)); } - public Map<String, String> getPathResources() { - return pathResources; + public List<ResourcesConfigGeneratorBeanEntry> getDependencies() { + return dependencies; } + + public void merge(ResourcesConfigGeneratorBean bean) { + this.dependencies.addAll(bean.dependencies); + } } \ No newline at end of file Copied: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBeanEntry.java (from rev 14244, branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBeanEntry.java) =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBeanEntry.java (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBeanEntry.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,66 @@ +/** + * 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.ajax4jsf.builder.generator; + +public final class ResourcesConfigGeneratorBeanEntry { + + public ResourcesConfigGeneratorBeanEntry(String name, String path, boolean pathResource, + ResourceType type, boolean derived) { + super(); + this.name = name; + this.path = path; + this.pathResource = pathResource; + this.type = type; + this.derived = derived; + } + + private String name; + + private String path; + + private boolean pathResource; + + private ResourceType type; + + private boolean derived; + + public boolean isPathResource() { + return pathResource; + } + + public String getName() { + return name; + } + + public String getPath() { + return path; + } + + public ResourceType getType() { + return type; + } + + public boolean isDerived() { + return derived; + } +} \ No newline at end of file Copied: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigParser.java (from rev 14244, branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigParser.java) =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigParser.java (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigParser.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,428 @@ +/** + * 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.ajax4jsf.builder.generator; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + +import org.ajax4jsf.builder.config.BuilderConfig; +import org.ajax4jsf.builder.config.ComponentBean; +import org.ajax4jsf.builder.config.RendererBean; +import org.ajax4jsf.builder.config.TagBean; +import org.ajax4jsf.builder.config.TagHandlerBean; +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.builder.TemplateCompiler; +import org.ajax4jsf.templatecompiler.elements.RootElement; +import org.ajax4jsf.templatecompiler.elements.TemplateElement; +import org.ajax4jsf.templatecompiler.elements.vcp.FResourceTemplateElement; +import org.ajax4jsf.templatecompiler.elements.vcp.HeaderResourceElement; +import org.ajax4jsf.templatecompiler.elements.vcp.HeaderScriptsElement; +import org.ajax4jsf.templatecompiler.elements.vcp.HeaderStylesElement; + +/** + * @author Nick Belaevski + * @since 3.3.0 + */ +public class ResourcesConfigParser { + + private JSFGeneratorConfiguration config; + + private Logger log; + + private File templates; + + private ResourcesConfigGeneratorBean resourcesConfigGeneratorBean; + + private Map<String, ResourcesConfigGeneratorBean> componentResourcesMap; + + public ResourcesConfigParser(JSFGeneratorConfiguration config, Logger log) { + super(); + + this.config = config; + this.log = log; + this.resourcesConfigGeneratorBean = new ResourcesConfigGeneratorBean(); + this.componentResourcesMap = new HashMap<String, ResourcesConfigGeneratorBean>(); + } + + public File getTemplates() { + return templates; + } + + public void setTemplates(File templates) { + this.templates = templates; + } + + private void addResources(ResourcesConfigGeneratorBean configBean, + TemplateElement templateElement, String packageName, + RendererBean renderer, BuilderConfig builderConfig) + throws ClassNotFoundException { + if (templateElement instanceof FResourceTemplateElement) { + FResourceTemplateElement resourceTemplateElement = (FResourceTemplateElement) templateElement; + String name = resourceTemplateElement.getName(); + + configBean.addResource(name, packageName, null, true); + } else if (templateElement instanceof RootElement) { + RootElement rootElement = (RootElement) templateElement; + + CompilationContext compilationContext = rootElement + .getComponentBean(); + + addResource(configBean, renderer, builderConfig, compilationContext); + } else if (templateElement instanceof HeaderResourceElement) { + HeaderResourceElement resourceElement = (HeaderResourceElement) templateElement; + + ResourceType type = null; + if (templateElement instanceof HeaderScriptsElement) { + type = ResourceType.SCRIPT; + } else if (templateElement instanceof HeaderStylesElement) { + type = ResourceType.STYLE; + } + + String[] paths = resourceElement.getResourcePaths(); + if (paths != null) { + for (int i = 0; i < paths.length; i++) { + String string = paths[i]; + + configBean.addResource(string, packageName, type, false); + } + } + } + + ArrayList<TemplateElement> subElements = templateElement + .getSubElements(); + for (TemplateElement element : subElements) { + addResources(configBean, element, packageName, renderer, + builderConfig); + } + } + + private String getResourceKey(String packageName, Object resource) { + try { + Class<? extends Object> resourceClass = resource.getClass(); + Method method = resourceClass.getMethod("getKey"); + String resourceKey = (String) method.invoke(resource); + + if (resourceKey != null && !resourceKey.equals(resourceClass.getName())) { + ClassLoader loader = config.getClassLoader(); + + if (loader.getResource(resourceKey) == null) { + String packagePath = packageName.replace('.', '/'); + if (packagePath.length() != 0) { + packagePath += "/"; + } + + if (loader.getResource(packagePath + resourceKey) == null) { + resourceKey = null; + } + } else { + if (!resourceKey.startsWith("/")) { + resourceKey = "/" + resourceKey; + } + } + } + + return resourceKey; + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return null; + } + + private String addResource(ResourcesConfigGeneratorBean configBean, + RendererBean renderer, BuilderConfig builderConfig, + CompilationContext compilationContext) + throws ClassNotFoundException { + String packageName; + String classname = renderer.getClassname(); + int idx = classname.lastIndexOf('.'); + if (idx != -1) { + packageName = classname.substring(0, idx); + } else { + packageName = ""; + } + + ClassLoader loader = builderConfig.getLoader(); + Class<?> cl = null; + + try { + cl = loader.loadClass(classname); + } catch (ClassNotFoundException e) { + String superclass = compilationContext.getBaseclassPackageName() + + "." + compilationContext.getBaseclassName(); + if (superclass != null) { + cl = loader.loadClass(superclass); + } + } + + if (cl != null) { + try { + GetResourceInterceptor interceptor = new GetResourceInterceptor(builderConfig.getLoader()); + + Object instance = AbstractClassStubBuilder.buildStub(cl, + interceptor, builderConfig.getLoader()); + + //clear list - some resources could be requested during class/instance initialization + Object[] result = null; + Method method = null; + Set<String> locatedResources = new HashSet<String>(); + + Class<?> cl1 = instance.getClass(); + while (cl1 != null && method == null) { + try { + method = cl1.getDeclaredMethod("getStyles"); + } catch (NoSuchMethodException e) { + cl1 = cl1.getSuperclass(); + } + } + + if (method != null) { + method.setAccessible(true); + result = (Object[]) method.invoke(instance); + if (result instanceof Object[]) { + for (Object object : result) { + String resourceName = interceptor.getResourceName(object); + + if (resourceName == null) { + resourceName = getResourceKey(packageName, object); + } + + if (resourceName != null) { + locatedResources.add(resourceName); + configBean.addResource(resourceName, packageName, ResourceType.STYLE, + false); + } + } + } + } + + method = null; + cl1 = instance.getClass(); + while (cl1 != null && method == null) { + try { + method = cl1.getDeclaredMethod("getScripts"); + } catch (NoSuchMethodException e) { + cl1 = cl1.getSuperclass(); + } + } + + if (method != null) { + method.setAccessible(true); + result = (Object[]) method.invoke(instance); + if (result instanceof Object[]) { + for (Object object : result) { + String resourceName = interceptor.getResourceName(object); + + if (resourceName == null) { + resourceName = getResourceKey(packageName, object); + } + + if (resourceName != null) { + locatedResources.add(resourceName); + configBean.addResource(resourceName, packageName, ResourceType.SCRIPT, + false); + } + } + } + + List<String> list = interceptor.getList(); + if (list != null) { + list.removeAll(locatedResources); + for (String resourceName : list) { + log.warn("Error detecting resource type: " + resourceName); + configBean.addResource(resourceName, packageName, null, + false); + } + } + } + } catch (SecurityException e) { + builderConfig.getLog().error(e.getMessage(), e); + } catch (IllegalArgumentException e) { + builderConfig.getLog().error(e.getMessage(), e); + } catch (IllegalAccessException e) { + builderConfig.getLog().error(e.getMessage(), e); + } catch (InvocationTargetException e) { + builderConfig.getLog().error(e.getMessage(), e); + } + } + return packageName; + } + + private void addResources(ResourcesConfigGeneratorBean configBean, + RendererBean renderer, BuilderConfig builderConfig) + throws CompilationException, IOException, ClassNotFoundException { + if (null != renderer) { + CompilationContext compilationContext = new RendererCompilationContext( + log, config.getClassLoader(), config); + + if (renderer.isGenerate()) { + String templateString = renderer.getTemplate(); + if (templateString != null) { + File template; + if (null != getTemplates()) { + template = new File(getTemplates(), templateString); + } else { + template = new File(templateString); + } + + TemplateCompiler templateCompiler = new TemplateCompiler(); + InputStream templateStream = new FileInputStream(template); + templateCompiler.processing(templateStream, + compilationContext); + + TemplateElement root = compilationContext.getTree(); + + String classname = renderer.getClassname(); + String packageName; + int idx = classname.lastIndexOf('.'); + if (idx != -1) { + packageName = classname.substring(0, idx); + } else { + packageName = ""; + } + + addResources(configBean, root, packageName, renderer, + builderConfig); + } + } else { + addResource(configBean, renderer, builderConfig, + compilationContext); + } + } + } + + public void parse(BuilderConfig config) throws CompilationException, IOException, ClassNotFoundException { + List<ComponentBean> components = config.getComponents(); + for (ComponentBean componentBean : components) { + ResourcesConfigGeneratorBean localBeanInstance = new ResourcesConfigGeneratorBean(); + RendererBean rendererBean = componentBean.getRenderer(); + + addResources(localBeanInstance, rendererBean, config); + + String componentName = null; + + TagBean tag = componentBean.getTag(); + if (tag != null) { + componentName = tag.getName(); + } + + if (componentName == null) { + TagHandlerBean taghandler = componentBean.getTaghandler(); + if (taghandler != null) { + componentName = taghandler.getName(); + } + } + + if (componentName != null) { + this.componentResourcesMap.put(componentName, localBeanInstance); + } + + this.resourcesConfigGeneratorBean.merge(localBeanInstance); + } + + List<RendererBean> renderers = config.getRenderers(); + for (RendererBean rendererBean : renderers) { + addResources(this.resourcesConfigGeneratorBean, rendererBean, config); + } + } + + public ResourcesConfigGeneratorBean getResourcesConfigGeneratorBean() { + return resourcesConfigGeneratorBean; + } + + public Map<String, ResourcesConfigGeneratorBean> getComponentResourcesMap() { + return componentResourcesMap; + } +} + +class GetResourceInterceptor implements MethodInterceptor { + + private static final Class<?>[] SIGNATURE = new Class<?>[] { String.class }; + + private ClassLoader classLoader; + + private List<String> list = new ArrayList<String>(); + + private Map<String, Object> resources = new HashMap<String, Object>(); + + private Map<Object, String> resourcesInverse = new IdentityHashMap<Object, String>(); + + public GetResourceInterceptor(ClassLoader loader) { + this.classLoader = loader; + } + + public List<String> getList() { + return list; + } + + public String getResourceName(Object resource) { + return resourcesInverse.get(resource); + } + + public void clearList() { + list.clear(); + } + + public Object intercept(Object instance, Method method, Object[] args, + MethodProxy methodProxy) throws Throwable { + + if ("getResource".equals(method.getName()) + && Arrays.equals(SIGNATURE, method.getParameterTypes())) { + + String resourceName = (String) args[0]; + list.add(resourceName); + + Object resource = resources.get(resourceName); + if (resource == null) { + Class<?> returnType = method.getReturnType(); + if (returnType.isInterface()) { + Object interfaceStub = AbstractClassStubBuilder.buildInterfaceStub(returnType, classLoader); + resources.put(resourceName, interfaceStub); + resourcesInverse.put(interfaceStub, resourceName); + + return interfaceStub; + } + } + + return null; + } else { + return methodProxy.invokeSuper(instance, args); + } + } + +} \ No newline at end of file Copied: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesDependenciesGenerator.java (from rev 14244, branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesDependenciesGenerator.java) =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesDependenciesGenerator.java (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesDependenciesGenerator.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,143 @@ +/** + * 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.ajax4jsf.builder.generator; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.Writer; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.ajax4jsf.builder.config.BuilderConfig; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; + +/** + * @author Nick Belaevski + * @since 3.3.0 + */ +public class ResourcesDependenciesGenerator extends InnerGenerator { + + private Map<String, ResourcesConfigGeneratorBean> componentDependencies; + private String uri; + private File dependencyFile; + + public ResourcesDependenciesGenerator(JSFGeneratorConfiguration config, + Logger log) { + super(config, log); + } + + @Override + public void createFiles(BuilderConfig config) throws GeneratorException { + try { + VelocityContext context = new VelocityContext(); + Template template = getTemplate(); + + Map<String, Map<String, Collection<String>>> componentsMap = new HashMap<String, Map<String, Collection<String>>>(); + for (Entry<String, ResourcesConfigGeneratorBean> entry : componentDependencies.entrySet()) { + Map<String, Collection<String>> resourcesMap = new HashMap<String, Collection<String>>(); + componentsMap.put(entry.getKey(), resourcesMap); + + Collection<String> scripts = new LinkedHashSet<String>(); + Collection<String> styles = new LinkedHashSet<String>(); + + ResourcesConfigGeneratorBean resourcesConfigBean = entry.getValue(); + List<ResourcesConfigGeneratorBeanEntry> dependencies = resourcesConfigBean.getDependencies(); + for (ResourcesConfigGeneratorBeanEntry beanEntry : dependencies) { + if (beanEntry.isDerived()) { + continue; + } + + ResourceType type = beanEntry.getType(); + if (type != null) { + switch (type) { + case SCRIPT: + scripts.add(beanEntry.getPath()); + break; + + case STYLE: + styles.add(beanEntry.getPath()); + break; + } + } + } + + resourcesMap.put("scripts", scripts); + resourcesMap.put("styles", styles); + } + + context.put("uri", uri); + context.put("components", componentsMap); + + File configFile = getDependencyFile(); + File javaDir = configFile.getParentFile(); + if (!javaDir.exists()) { + javaDir.mkdirs(); + } + if (configFile.exists()) { + configFile.delete(); + } + Writer out = new BufferedWriter(new FileWriter(configFile)); + template.merge(context, out); + out.flush(); + out.close(); + } catch (Exception e) { + throw new GeneratorException(e.getMessage(), e); + } + } + + @Override + protected String getDefaultTemplateName() { + return "resources-dependencies.vm"; + } + + public Map<String, ResourcesConfigGeneratorBean> getComponentDependencies() { + return componentDependencies; + } + + public void setComponentDependencies( + Map<String, ResourcesConfigGeneratorBean> componentDependencies) { + this.componentDependencies = componentDependencies; + } + + public void setDependencyFile(File dependencyFile) { + this.dependencyFile = dependencyFile; + } + + public File getDependencyFile() { + return dependencyFile; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TagTestGenerator.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TagTestGenerator.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TagTestGenerator.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.generator; import java.io.BufferedWriter; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.generator; import java.util.Date; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator2.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator2.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/TestDataGenerator2.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.generator; import java.util.HashMap; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodyMerge.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodyMerge.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodyMerge.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.xml; import java.util.ArrayList; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodySerializer.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodySerializer.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBodySerializer.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.xml; import java.io.StringWriter; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XPathComparator.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XPathComparator.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XPathComparator.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.xml; import java.util.Comparator; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -508,7 +508,15 @@ log.debug("Processing function : " + node.getLocalName()); log.debug("Processing function : " + node.getOutputName()); - if (node.getPrefix().equals("this")) { + String prefix = node.getPrefix(); + boolean isThis = prefix.equals("this"); + boolean isUtils = prefix.equals("utils"); + + if (isThis || isUtils) { + if (isUtils) { + sb.append("getUtils()."); + } + sb.append(node.getLocalName()); sb.append("("); int numChildren = node.jjtGetNumChildren(); Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/AjaxRenderedAreaElement.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/AjaxRenderedAreaElement.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/AjaxRenderedAreaElement.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.templatecompiler.elements.vcp; import org.ajax4jsf.templatecompiler.builder.CompilationContext; Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,26 +1,3 @@ -/** - * 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.ajax4jsf.templatecompiler.utils; - /* * Copyright 2004-2006 The Apache Software Foundation. * @@ -37,6 +14,8 @@ * limitations under the License. */ +package org.ajax4jsf.templatecompiler.utils; + /** * @author Martin Marinschek * @version $Revision: 1.1.2.1 $ $Date: 2006/12/20 18:56:39 $ <p/> $Log: Modified: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java =================================================================== --- branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,26 +1,3 @@ -/** - * 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.ajax4jsf.templatecompiler.utils; - /* * Copyright 2004 The Apache Software Foundation. * @@ -37,6 +14,8 @@ * limitations under the License. */ +package org.ajax4jsf.templatecompiler.utils; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd 2009-05-19 22:58:34 UTC (rev 14245) @@ -48,7 +48,7 @@ <!-- Full name of Java super class --> <!ELEMENT superclass (#PCDATA)> <!-- Define renderer for this component --> -<!ELEMENT renderer (name,(classname|template),superclass?,description?,displayname?,icon?,facet?,renderkit?)> +<!ELEMENT renderer (name,family?,(classname|template),superclass?,description?,displayname?,icon?,facet?,renderkit?)> <!-- Define render kit Id for renderer --> <!ELEMENT renderkit (#PCDATA)> <!-- Template file name --> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -28,7 +28,10 @@ <property > <name>limitToList</name> <classname>boolean</classname> - <description>If "true", updates on client side ONLY elements from this 'reRender' property. If "false" (default) updates all rendered by ajax region components</description> + <description>If "true", then of all AJAX-rendered on the page components only those will be updated, + which ID's are passed to the "reRender" attribute of the describable component. + "false"-the default value-means that all components with ajaxRendered="true" will be updated. + </description> </property> <property > @@ -67,12 +70,12 @@ <property > <name>oncomplete</name> <classname>java.lang.String</classname> - <description>JavaScript code for call after request completed on client side</description> + <description>The client side script method to be called after the request is completed</description> </property> <property> <name>onbeforedomupdate</name> <classname>java.lang.String</classname> - <description>JavaScript code for call before DOM has been updated on client side</description> + <description>The client side script method to be called before DOM is updated</description> </property> <property > <name>focus</name> @@ -98,6 +101,11 @@ <classname>int</classname> <description>Response waiting time on a particular request. If a response is not received during this time, the request is aborted</description> </property> + <property> + <name>similarityGroupingId</name> + <classname>java.lang.String</classname> + <description>If there are any component requests with identical IDs then these requests will be grouped.</description> + </property> <!-- <property > <name></name> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_output_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_output_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_output_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -5,7 +5,7 @@ <defaultvalue>true</defaultvalue> <description> Define, must be (or not) content of this component will be included in AJAX response created by parent AJAX Container, even if not forced by reRender list of ajax action. - Ignored if component marked to output by some Ajax action component. + Ignored if component marked to output by some Ajax action component. The default value is "true". </description> </property> <property> @@ -14,6 +14,7 @@ <description><![CDATA[ Flag for mark all child components to non-transient. If "true", all children components will be set to non-transient state and keep in saved components tree. For output in self-renderer region all content (By default, all content in <f:verbatim> tags and non-jsf elements in facelets, marked as transient - since, self-rendered ajax regions don't plain output for ajax processing). + The default value is "false". ]]></description> <defaultvalue>false</defaultvalue> </property> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -7,7 +7,7 @@ <property> <name>typeMapping</name> <classname>java.lang.Object</classname> - <description><![CDATA[Map between a draggable type and an indicator name on zone. it's defined with the pair (drag type:indicator name))]]></description> + <description><![CDATA[The attribute associates a type of dragable zone (dragType) with &lt;rich:dndParam&gt; defined for &lt;rich:dropSupport&gt; for passing parameter value to &lt;rich:dragIndicator&gt;. It uses JSON format: (drag_type: parameter_name).]]></description> <!-- <defaultvalue><![CDATA[]]></defaultvalue> --> </property> <property> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_control_events.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_control_events.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_control_events.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -3,17 +3,17 @@ <property> <name>onblur</name> <classname>java.lang.String</classname> - <description>HTML: script expression; the element lost the focus</description> + <description>The client side script method to be called when the element loses the focus</description> </property> <property> <name>onfocus</name> <classname>java.lang.String</classname> - <description>HTML: script expression; the element got the focus</description> + <description>The client side script method to be called when the element gets the focus</description> </property> <property> <name>onchange</name> <classname>java.lang.String</classname> - <description>HTML: script expression; the element value was changed</description> + <description>The client side script method to be called when the element value is changed</description> </property> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_events.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_events.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_events.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -3,52 +3,52 @@ <property> <name>onclick</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer button is clicked</description> + <description>The clientside script method to be called when the element is clicked</description> </property> <property> <name>ondblclick</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer button is double-clicked</description> + <description>The client side script method to be called when the element is double-clicked</description> </property> <property> <name>onkeydown</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a key is pressed down</description> + <description>The client side script method to be called when a key is pressed down over the element</description> </property> <property> <name>onkeypress</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a key is pressed and released</description> + <description>The client side script method to be called when a key is pressed over the element and released</description> </property> <property> <name>onkeyup</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a key is released</description> + <description>The client side script method to be called when a key is released</description> </property> <property> <name>onmousedown</name> <classname>java.lang.String</classname> - <description>HTML: script expression; a pointer button is pressed down</description> + <description>The client side script method to be called when a mouse button is pressed down over the element</description> </property> <property> <name>onmousemove</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer is moved within</description> + <description>The client side script method to be called when a pointer is moved within the element</description> </property> <property> <name>onmouseout</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer is moved away</description> + <description>The client side script method to be called when a pointer is moved away from the element</description> </property> <property> <name>onmouseover</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer is moved onto</description> + <description>The client side script method to be called when a pointer is moved onto the element</description> </property> <property> <name>onmouseup</name> <classname>java.lang.String</classname> - <description>HTML: script expression; a pointer button is released</description> + <description>The client side script method to be called when a mouse button is released</description> </property> </properties> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -20,12 +20,12 @@ <property> <name>onreset</name> <classname>java.lang.String</classname> - <description>The onreset event occurs when a form is reset. It only applies to the FORM element</description> + <description>HTML: script expression; a form is reseted. It only applies to the FORM element</description> </property> <property> <name>onsubmit</name> <classname>java.lang.String</classname> - <description>The onsubmit event occurs when a form is submitted. It only applies to the FORM element</description> + <description>HTML: script expression; a form is submitted. It only applies to the FORM element</description> </property> <property> <name>target</name> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -13,7 +13,10 @@ <property> <name>maxlength</name> <classname>int</classname> - <description>When the type attribute has the value "text" or "password", this attribute specifies the maximum number of characters you may enter. This number may exceed the specified size, in which case the user agent should offer a scrolling mechanism. The default value for this attribute is an unlimited number</description> + <description>Specifies the maximum number of digits that could be entered into the input field. + The maximum number is unlimited by default. + If entered value exceeds the value specified in "maxValue" attribute than the slider takes a maximum value position. + </description> </property> </properties> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -20,16 +20,16 @@ <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> </property> <property> - <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; the element lost the focus</description> </property> <property> - <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + <name>onchange</name><classname>java.lang.String</classname><description>HTML: script expression; the element value was changed</description> </property> <property> - <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description> </property> <property> - <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + <name>onselect</name><classname>java.lang.String</classname><description>HTML: script expression; text is selected in an input field</description> </property> <property> <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -3,6 +3,6 @@ <property> <name>onselect</name> <classname>java.lang.String</classname> - <description>HTML: script expression; The onselect event occurs when you select some text in a text field. This attribute may be used with the INPUT and TEXTAREA elements</description> + <description>The client side script method to be called when some text is selected in the text field. This attribute can be used with the INPUT and TEXTAREA elements.</description> </property> </properties> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -20,16 +20,16 @@ <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> </property> <property> - <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> </property> <property> - <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + <name>onchange</name><classname>java.lang.String</classname><description>HTML: script expression; element's value is changed</description> </property> <property> - <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description> </property> <property> - <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + <name>onselect</name><classname>java.lang.String</classname><description>HTML: script expression; text is selected in an input field</description> </property> <property> <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -6,10 +6,10 @@ </property> <property> - <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> </property> <property> - <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description> </property> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -16,13 +16,13 @@ <property> - <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> </property> <property> - <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + <name>onchange</name><classname>java.lang.String</classname><description>HTML: script expression; element's value is changed</description> </property> <property> - <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description> </property> <property> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -20,16 +20,16 @@ <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> </property> <property> - <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + <name>onblur</name><classname>java.lang.String</classname><description>The client side script method to be called when the element loses the focus either when pointing a device or tabbing navigation. It may be used for the same elements as onfocus</description> </property> <property> - <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + <name>onchange</name><classname>java.lang.String</classname><description>The client side script method to be called when the element value is changed</description> </property> <property> - <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + <name>onfocus</name><classname>java.lang.String</classname><description>The client side script method to be called when the element gets the focus</description> </property> <property> - <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + <name>onselect</name><classname>java.lang.String</classname><description>The client side script method to be called when some text is selected in the input field</description> </property> <property> <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent 2009-05-19 22:58:34 UTC (rev 14245) @@ -33,6 +33,32 @@ <methodargs>javax.faces.event.ValueChangeEvent</methodargs> <description>Listener for value changes</description> </property> - - + <property> + <name>requiredMessage</name> + <classname>java.lang.String</classname> + <description> + A ValueExpression enabled attribute that, if present, + will be used as the text of the validation message for + the &quot;required&quot; facility, if the &quot;required&quot; facility is + used + </description> + </property> + <property> + <name>validatorMessage</name> + <classname>java.lang.String</classname> + <description> + A ValueExpression enabled attribute that, if present, + will be used as the text of the validator message, + replacing any message that comes from the validator + </description> + </property> + <property> + <name>converterMessage</name> + <classname>java.lang.String</classname> + <description> + A ValueExpression enabled attribute that, if present, + will be used as the text of the converter message, + replacing any message that comes from the converter + </description> + </property> </properties> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -103,6 +103,23 @@ #end #end #end + +#foreach($renderer in $renderers) + #set($rendererClass = $renderkit.rendererClass($renderer.classname) ) + #if( $renderer.generate || $facesConfig.rendererExists("${rendererClass}")) + <renderer> + <component-family>${renderer.family}</component-family> + <renderer-type> + ${renderer.name} + </renderer-type> + <renderer-class> + ${rendererClass} + </renderer-class> + </renderer> + #end +#end + + </render-kit> #end Copied: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/resources-dependencies.vm (from rev 14244, branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/resources-dependencies.vm) =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/resources-dependencies.vm (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates/resources-dependencies.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components> + <namespace>$uri</namespace> + +#foreach( $key in ${components.keySet()}) + <component> + <name>$key</name> + + #set($componentEntry = ${components.get($key)}) + #set($scripts = ${componentEntry.get("scripts")}) + #set($styles = ${componentEntry.get("styles")}) + + #if(!${scripts.isEmpty()}) + <scripts> + #foreach($script in $scripts) + <script>$script</script> + #end + </scripts> + #end + + #if(!${styles.isEmpty()}) + <styles> + #foreach($style in $styles) + <style>$style</style> + #end + </styles> + #end + </component> +#end + +</components> Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -103,6 +103,22 @@ #end #end #end + +#foreach($renderer in $renderers) + #set($rendererClass = $renderkit.rendererClass($renderer.classname) ) + #if( $renderer.generate || $facesConfig.rendererExists("${rendererClass}")) + <renderer> + <component-family>${renderer.family}</component-family> + <renderer-type> + ${renderer.name} + </renderer-type> + <renderer-class> + ${rendererClass} + </renderer-class> + </renderer> + #end +#end + </render-kit> #end Copied: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/resources-dependencies.vm (from rev 14244, branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/resources-dependencies.vm) =================================================================== --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/resources-dependencies.vm (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/resources-dependencies.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components> + <namespace>$uri</namespace> + +#foreach( $key in ${components.keySet()}) + <component> + <name>$key</name> + + #set($componentEntry = ${components.get($key)}) + #set($scripts = ${componentEntry.get("scripts")}) + #set($styles = ${componentEntry.get("styles")}) + + #if(!${scripts.isEmpty()}) + <scripts> + #foreach($script in $scripts) + <script>$script</script> + #end + </scripts> + #end + + #if(!${styles.isEmpty()}) + <styles> + #foreach($style in $styles) + <style>$style</style> + #end + </styles> + #end + </component> +#end + +</components> Modified: branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyMergeTest.java =================================================================== --- branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyMergeTest.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyMergeTest.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.xml; import junit.framework.TestCase; Modified: branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodySerializerTest.java =================================================================== --- branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodySerializerTest.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodySerializerTest.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.xml; import java.io.ByteArrayInputStream; Modified: branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XPathComparatorTest.java =================================================================== --- branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XPathComparatorTest.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XPathComparatorTest.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.xml; import java.io.ByteArrayInputStream; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/MavenXMLMerge.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/MavenXMLMerge.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/MavenXMLMerge.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.maven; import java.io.File; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/VelocityTaglibMergeCallBack.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/VelocityTaglibMergeCallBack.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/VelocityTaglibMergeCallBack.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.maven; import java.io.File; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/XMLMergeCallback.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/XMLMergeCallback.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/maven/XMLMergeCallback.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.maven; /** Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -30,7 +30,10 @@ import java.net.URLClassLoader; import java.util.Iterator; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.project.MavenProject; @@ -40,7 +43,6 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; -import org.codehaus.plexus.velocity.DefaultVelocityComponent; import org.codehaus.plexus.velocity.VelocityComponent; /** @@ -258,6 +260,10 @@ if(null == taglib.getTaglib()){ taglib.setTaglib(taglib.getShortName()); } + + if (null == taglib.getTlibVersion()) { + taglib.setTlibVersion(createTaglibVersionFromProjectVersion()); + } getLog().debug("Taglib uri is " + taglib.getUri()); getLog().debug("Taglib shortname is " + taglib.getShortName()); if (null != library.getTaglibs() && library.getTaglibs().length > 0) { @@ -269,6 +275,17 @@ return taglib; } + private String createTaglibVersionFromProjectVersion() { + Artifact artifact = project.getArtifact(); + String version = artifact.getVersion(); + Matcher matcher = Pattern.compile("^(\\d+(?:\\.\\d+)*)").matcher(version); + if (matcher.find()) { + return matcher.group(1); + } + + return "1.2"; + } + protected void writeParsedTemplate(String templateName, VelocityContext context, File configFile) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException, Exception { File dir = configFile.getParentFile(); if(!dir.exists()){ @@ -333,9 +350,12 @@ if(null == taglib.getTaglib()){ taglib.setTaglib(taglib.getShortName()); } + if (null == taglib.getTlibVersion()) { + taglib.setTlibVersion(createTaglibVersionFromProjectVersion()); + } getLog().debug("Taglib uri is " + taglib.getUri()); getLog().debug("Taglib shortname is " + taglib.getShortName()); - + getLog().debug("Taglib version is " + taglib.getTlibVersion()); } } Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,141 @@ +/** + * 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.ajax4jsf.builder.mojo; + +import java.io.File; +import java.util.HashSet; +import java.util.Set; + +import org.aja4jsf.builder.model.Resource; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.velocity.VelocityContext; + +/** + * @author Nick Belaevski + * + */ +public abstract class AbstractCreateMojo extends AbstractCDKMojo { + + protected static final String SRC_MAIN_RESOURCES = "src/main/resources"; + + protected static final Set<String> JAVA_RESERVED_WORDS; + + static{ + JAVA_RESERVED_WORDS = new HashSet<String>(); + JAVA_RESERVED_WORDS.add("abstract"); + JAVA_RESERVED_WORDS.add("assert"); + JAVA_RESERVED_WORDS.add("boolean"); + JAVA_RESERVED_WORDS.add("break"); + JAVA_RESERVED_WORDS.add("byte"); + JAVA_RESERVED_WORDS.add("case"); + JAVA_RESERVED_WORDS.add("catch"); + JAVA_RESERVED_WORDS.add("char"); + JAVA_RESERVED_WORDS.add("class"); + JAVA_RESERVED_WORDS.add("const"); + JAVA_RESERVED_WORDS.add("continue"); + JAVA_RESERVED_WORDS.add("default"); + JAVA_RESERVED_WORDS.add("do"); + JAVA_RESERVED_WORDS.add("double"); + JAVA_RESERVED_WORDS.add("else"); + JAVA_RESERVED_WORDS.add("extends"); + JAVA_RESERVED_WORDS.add("false"); + JAVA_RESERVED_WORDS.add("final"); + JAVA_RESERVED_WORDS.add("finally"); + JAVA_RESERVED_WORDS.add("float"); + JAVA_RESERVED_WORDS.add("for"); + JAVA_RESERVED_WORDS.add("goto"); + JAVA_RESERVED_WORDS.add("if"); + JAVA_RESERVED_WORDS.add("implements"); + JAVA_RESERVED_WORDS.add("import"); + JAVA_RESERVED_WORDS.add("instanceof"); + JAVA_RESERVED_WORDS.add("int"); + JAVA_RESERVED_WORDS.add("interface"); + JAVA_RESERVED_WORDS.add("long"); + JAVA_RESERVED_WORDS.add("native"); + JAVA_RESERVED_WORDS.add("new"); + JAVA_RESERVED_WORDS.add("null"); + JAVA_RESERVED_WORDS.add("package"); + JAVA_RESERVED_WORDS.add("private"); + JAVA_RESERVED_WORDS.add("protected"); + JAVA_RESERVED_WORDS.add("public"); + JAVA_RESERVED_WORDS.add("return"); + JAVA_RESERVED_WORDS.add("short"); + JAVA_RESERVED_WORDS.add("static"); + JAVA_RESERVED_WORDS.add("strictfp"); + JAVA_RESERVED_WORDS.add("super"); + JAVA_RESERVED_WORDS.add("switch"); + JAVA_RESERVED_WORDS.add("synchronized"); + JAVA_RESERVED_WORDS.add("this"); + JAVA_RESERVED_WORDS.add("throw"); + JAVA_RESERVED_WORDS.add("throws"); + JAVA_RESERVED_WORDS.add("transient"); + JAVA_RESERVED_WORDS.add("true"); + JAVA_RESERVED_WORDS.add("try"); + JAVA_RESERVED_WORDS.add("void"); + JAVA_RESERVED_WORDS.add("volatile"); + JAVA_RESERVED_WORDS.add("while"); + } + + protected void checkAndCreateDirectory(File directory) + throws MojoExecutionException { + getLog().debug("Checking directory " + directory + " for existence"); + if (!directory.exists()) { + directory.mkdirs(); + getLog().debug("Directory " + directory + " created"); + } + if (!directory.isDirectory()) { + throw new MojoExecutionException("Directory " + directory.getAbsolutePath() + " is not a Directory"); + } + } + + protected void filterJarResource(Resource template, Resource skinResource, File baseDir, + VelocityContext context) throws Exception { + File newFile = new File(baseDir, skinResource.getPath()); + if (newFile.exists()) { + getLog().debug("File " + newFile + " already exists. Skipping."); + } else { + try { + writeParsedTemplate(template.getPath(), context, newFile); + } catch (Exception e) { + throw new MojoExecutionException("Unable to write file " + newFile, e); + } + } + } + + protected boolean isValidJavaName(String name) { + return !JAVA_RESERVED_WORDS.contains(name); + } + + protected boolean isValidPackageName(String packageName) { + if (packageName != null) { + String[] packageNameSegments = packageName.split("\\."); + for (String packageNameSegment : packageNameSegments) { + if (!isValidJavaName(packageNameSegment)) { + return false; + } + } + } + + return true; + } + +} Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -72,8 +72,8 @@ * criteria. for accepted modules, unpack it to classes directory, and put * config files in separate directories. 4. Append unpacked directory to * resources, included in result jar. 5. Merge all META-INF/faces-config.xml , - * *.tld, *.taglib.xml , resources-config.xml into ones. 6. append dependencies - * of included projects to this. + * *.tld, *.taglib.xml, *.component-dependencies.xml , resources-config.xml into ones. + * 6. append dependencies of included projects to this. * * @author shura * @goal assembly @@ -90,6 +90,8 @@ private static final String RESOURCES_CONFIG_TEMPLATE = "resources-config.vm"; + private static final String COMPONENT_DEPENDENCIES_TEMPLATE = "component-dependencies.vm"; + private static final String XCSS_TEMPLATE = "xcss.vm"; private static final String TLD_TEMPLATE = "tld.vm"; @@ -106,12 +108,19 @@ "library-class", "namespace", "tag", "function" }; + private static final String[] DEPENDENCIES_TAG_NAMES = new String[] { + "component" + }; + private static final Comparator<Node> TLD_COMPARATOR = new NamesListComparator( new XPathComparator("listener-class/text()", "name/text()"), TLD_TAG_NAMES); private static final Comparator<Node> FACELET_COMPARATOR = new NamesListComparator( new XPathComparator("function-name/text()", "tag-name/text()"), TAGLIB_TAG_NAMES); + private static final Comparator<Node> DEPENDENCIES_COMPARATOR = new NamesListComparator( + new XPathComparator("name/text()"), DEPENDENCIES_TAG_NAMES); + /** * Used to look up Artifacts in the remote repository. * @@ -221,6 +230,11 @@ /** * @parameter */ + private String includeDependencies = "META-INF/*.component-dependencies.xml"; + + /** + * @parameter + */ private String includeXcss = "**/*.xcss"; /** @@ -264,6 +278,7 @@ mergeXML(models, "META-INF/resources-config.xml", null, RESOURCES_CONFIG_TEMPLATE, "/resource-config/resource", "name/text()", new VelocityContext(), resourcesConfig, false, null); + if (null != commonStyle) { File commonXcss = new File(outputDirectory, commonStyle); mergeXML(models, includeXcss, excludeXcss, XCSS_TEMPLATE, @@ -301,10 +316,10 @@ } } } - generateTaglib(taglibModels, taglib); + generateTaglibAndDependencies(taglibModels, taglib); } } else { - generateTaglib(models, library.getTaglib()); + generateTaglibAndDependencies(models, library.getTaglib()); } } @@ -312,7 +327,7 @@ * @param models * @throws MojoExecutionException */ - private void generateTaglib(List<Model> models, Taglib taglib) + private void generateTaglibAndDependencies(List<Model> models, Taglib taglib) throws MojoExecutionException { getLog().debug( "Assembly taglib for uri " + taglib.getUri() @@ -341,6 +356,14 @@ mergeXML(models, includeTaglib, null, TAGLIB_TEMPLATE, commonXPath, "tag-name/text() | function-name/text()", new VelocityContext( taglibContext), faceletsTaglib, false, FACELET_COMPARATOR); getLog().debug("Write Facelets taglib " + faceletsTaglib.getPath()); + + File dependenciesFile = new File(outputDirectory, "META-INF/" + + taglib.getTaglib() + ".component-dependencies.xml"); + commonXPath = "/components/component" + createTagCondition(taglib, "name"); + + mergeXML(models, includeDependencies, null, COMPONENT_DEPENDENCIES_TEMPLATE, commonXPath, "name/text()", new VelocityContext( + taglibContext), dependenciesFile, false, DEPENDENCIES_COMPARATOR); + getLog().debug("Write dependencies file " + dependenciesFile.getPath()); } /** @@ -715,6 +738,7 @@ resource.addExclude("META-INF/faces-config.xml"); resource.addExclude("META-INF/resources-config.xml"); resource.addExclude("META-INF/*.taglib.xml"); + resource.addExclude("META-INF/*.component-dependencies.xml"); resource.addExclude("META-INF/*.tld"); project.addResource(resource); Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CompileMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CompileMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CompileMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -26,13 +26,11 @@ import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Parent; import org.apache.maven.plugin.MojoExecutionException; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -26,7 +26,6 @@ import java.util.List; import org.apache.maven.model.Plugin; -import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.velocity.VelocityContext; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.mojo; import java.io.File; @@ -46,10 +67,8 @@ * @author Maksim Kaszynski * */ -public class CreateSkinMojo extends AbstractCDKMojo { +public class CreateSkinMojo extends AbstractCreateMojo { - private static final String SRC_MAIN_RESOURCES = "src/main/resources"; - private static final String PROPERTIES = ".skin.properties"; private static final String XCSS = ".xcss"; @@ -59,7 +78,7 @@ private static final String SRC_MAIN_CONFIG_RESOURCES = "src/main/config/resources"; private static final String META_INF_SKINS = "META-INF/skins/"; - + /** * Name of base package of skin. * If it is not set, GroupId is used. @@ -138,8 +157,16 @@ getLog().debug("Skin name is supposed to be " + shortName); getLog().debug("Root package " + packageName); getLog().debug("Skin package is " + fullSkinName); - - + + //RF-4023 + if (!isValidJavaName(skinName)){ + throw new MojoExecutionException("Invalid skin name '" + skinName + "'. Please type another name."); + } + + if (!isValidPackageName(packageName)) { + throw new MojoExecutionException("Invalid skin package '" + packageName + "'. Please type another package."); + } + SkinInfo skinInfoTemplate = new SkinInfo(); skinInfoTemplate.setShortName(shortName); skinInfoTemplate.setPackageName(fullSkinName.toLowerCase()); @@ -184,19 +211,6 @@ } } - private void filterJarResource(Resource template, Resource skinResource, File baseDir, VelocityContext context) throws Exception{ - File newFile = new File(baseDir, skinResource.getPath()); - if (newFile.exists()) { - getLog().debug("File " + newFile + " already exists. Skipping."); - } else { - try { - writeParsedTemplate(template.getPath(), context, newFile); - } catch (Exception e) { - throw new MojoExecutionException("Unable to write file " + newFile, e); - } - } - } - private List<Resource> filterComponentSkinTemplates(List<Resource> jarTemplates, SkinInfo skinInfo, File resourceDir) throws MojoExecutionException { List<Resource> newResources = new ArrayList<Resource>(jarTemplates.size()); for (Resource jarTemplate : jarTemplates) { @@ -396,17 +410,6 @@ return pluginArtifact.getFile(); } - private void checkAndCreateDirectory(File directory) throws MojoExecutionException { - getLog().debug("Checking directory " + directory + " for existence"); - if (!directory.exists()) { - directory.mkdirs(); - getLog().debug("Directory " + directory + " created"); - } - if (!directory.isDirectory()) { - throw new MojoExecutionException("Directory " + directory.getAbsolutePath() + " is not a Directory"); - } - } - private void addToResourceConfig(List<Resource> resources, File resourceConfigFile) throws Exception{ ResourceConfig resourceConfig = null; Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,158 @@ +/** + * 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.ajax4jsf.builder.mojo; + +import java.io.File; +import java.util.Locale; + +import org.aja4jsf.builder.model.Resource; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.velocity.VelocityContext; + +/** + * This mojo is intended to create new theme within existing project. + * <p><b>Usage</b> <tt>mvn cdk:add-theme -Dname=&lt;themeName&gt; [ -Dpackage=&lt;themePackage&gt; ]</tt></p> + * This adds new theme named &lt;themeName&gt; to project resources/META-INF/themes folder.<br/> + * If <em>package</em> is not specified, it is set same as groupId.<br/> + * + * Following parameters can be used + * <li><strong>name</strong> - name of the theme. <strong>Required.</strong></li> + * <li><strong>package</strong> - base package of the theme. If not specified, <em>groupId</em> is used</li> + * + * @goal add-theme + * @requiresProject true + * + * @author Nick Belaevski + */ +public class CreateThemeMojo extends AbstractCreateMojo { + + private static final String XCSS = ".xcss"; + + private static final String META_INF_THEMES = "META-INF/themes/"; + + private static final String XCSS_THEMES_PACKAGE = "/renderkit/html/css"; + + private static final String THEME_PROPERTIES = ".theme.properties"; + + private static final String RENDERKIT_THEMES = "renderkit.html"; + + /** + * Name of base package of theme. + * If it is not set, GroupId is used. + * @parameter expression="${package}" default-value="${project.groupId}" + */ + private String packageName; + + + /** + * Name of theme. Required parameter. + * @parameter expression="${name}" + * @required + */ + private String themeName; + + private String generateRendererName(String themeName) { + StringBuilder rendererTypeBuilder = new StringBuilder(); + rendererTypeBuilder.append(Character.toUpperCase(themeName.charAt(0))); + rendererTypeBuilder.append(themeName.subSequence(1, themeName.length())); + rendererTypeBuilder.append("Renderer"); + return rendererTypeBuilder.toString(); + } + + private void generateTheme(String packageName, String themeName) throws MojoExecutionException, MojoFailureException { + Resource themeProperties = new Resource("theme/themes/theme.properties"); + Resource themeXCSS = new Resource("theme/css/theme.xcss"); + Resource themeConfig = new Resource("theme/component/theme.xml"); + Resource themeTemplate = new Resource("theme/template/theme.jspx"); + + File resourceDir = new File(project.getBasedir(), SRC_MAIN_RESOURCES); + + String packagePath = packageName.replace('.', '/'); + String xcssPackagePath = packagePath + XCSS_THEMES_PACKAGE; + String rendererName = generateRendererName(themeName); + String rendererType = packageName + '.' + rendererName; + String rendererClassName = packageName + '.' + RENDERKIT_THEMES + '.' + rendererName; + + getLog().debug("Relative path to package is " + packagePath); + + VelocityContext velocityMasterContext = new VelocityContext(); + velocityMasterContext.put("packagePath", packagePath); + velocityMasterContext.put("xcssPackagePath", xcssPackagePath); + velocityMasterContext.put("name", themeName); + velocityMasterContext.put("rendererType", rendererType); + velocityMasterContext.put("rendererClassName", rendererClassName); + + Resource properties = new Resource(META_INF_THEMES + themeName + THEME_PROPERTIES); + try { + filterJarResource(themeProperties, properties, resourceDir, velocityMasterContext); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering resource " + themeProperties + " into " + properties, e); + } + + Resource xcss = new Resource(xcssPackagePath + '/' + themeName + XCSS); + try { + filterJarResource(themeXCSS, xcss, resourceDir, velocityMasterContext); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering resource " + themeXCSS + " into " + xcss, e); + } + + File configDir = new File(project.getBasedir(), "src/main/config/component"); + Resource config = new Resource(themeName + ".xml"); + try { + filterJarResource(themeConfig, config, configDir, velocityMasterContext); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering resource " + themeConfig + " into " + config, e); + } + + File templateDir = new File(project.getBasedir(), "src/main/templates"); + Resource template = new Resource(packagePath + '/' + themeName + ".jspx"); + try { + filterJarResource(themeTemplate, template, templateDir, velocityMasterContext); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering resource " + themeTemplate + " into " + template, e); + } + } + + public void execute() throws MojoExecutionException, MojoFailureException { + getLog().info("Executing " + project); + getLog().info("Generating Theme " + themeName); + + String themePackageName = packageName.replace('/', '.').toLowerCase(Locale.US); + String shortName = themeName; + getLog().debug("Root package " + packageName); + getLog().debug("Theme package is " + themePackageName); + + if (!isValidJavaName(themeName)){ + throw new MojoExecutionException("Invalid theme name '" + themeName + "'. Please type another name."); + } + + if (!isValidPackageName(packageName)) { + throw new MojoExecutionException("Invalid theme package '" + packageName + "'. Please type another package."); + } + + generateTheme(themePackageName, shortName); + + getLog().info("Generating Theme successful"); + } + +} Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -26,7 +26,6 @@ import org.ajax4jsf.builder.config.BuilderConfig; import org.ajax4jsf.builder.config.ParsingException; -import org.ajax4jsf.builder.generator.ComponentGenerator; import org.ajax4jsf.builder.generator.ComponentGenerator2; import org.ajax4jsf.builder.generator.ComponentTagGenerator; import org.ajax4jsf.builder.generator.ConverterGenerator; @@ -40,6 +39,8 @@ import org.ajax4jsf.builder.generator.RenderKitBean; import org.ajax4jsf.builder.generator.RendererGenerator; import org.ajax4jsf.builder.generator.ResourcesConfigGenerator; +import org.ajax4jsf.builder.generator.ResourcesConfigParser; +import org.ajax4jsf.builder.generator.ResourcesDependenciesGenerator; import org.ajax4jsf.builder.generator.TagHandlerGenerator; import org.ajax4jsf.builder.generator.TaglibGenerator; import org.ajax4jsf.builder.generator.ValidatorGenerator; @@ -211,9 +212,23 @@ faceletsTaglibGenerator.createFiles(config); } + ResourcesConfigParser resourcesConfigParser = new ResourcesConfigParser(resourcesConfiguration, mavenLogger); + resourcesConfigParser.setTemplates(templatesDirectory); + resourcesConfigParser.parse(config); + + if (taglib != null) { + ResourcesDependenciesGenerator resourcesDependenciesGenerator = new ResourcesDependenciesGenerator(resourcesConfiguration, mavenLogger); + resourcesDependenciesGenerator.setUri(taglib.getUri()); + resourcesDependenciesGenerator.setDependencyFile(new File(outputResourcesDirectory, + "META-INF/" + taglib.getShortName() + ".component-dependencies.xml")); + resourcesDependenciesGenerator.setComponentDependencies(resourcesConfigParser.getComponentResourcesMap()); + resourcesDependenciesGenerator.createFiles(config); + } + // Generate resources configuration file resources-config.xml // for all images/scripts/css... ResourcesConfigGenerator resourcesConfigGenerator = new ResourcesConfigGenerator(resourcesConfiguration, mavenLogger); + resourcesConfigGenerator.setResourcesConfigGeneratorBean(resourcesConfigParser.getResourcesConfigGeneratorBean()); resourcesConfigGenerator.setInclude(resourcesInclude); resourcesConfigGenerator.setTemplates(templatesDirectory); resourcesConfigGenerator.setResourcesConfig(new File( Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateTestMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateTestMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateTestMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * 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.ajax4jsf.builder.mojo; import org.ajax4jsf.builder.config.BuilderConfig; @@ -6,8 +27,6 @@ import org.ajax4jsf.builder.maven.MavenLogger; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; -import org.apache.velocity.Template; /** * Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/SkinInfo.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/SkinInfo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/SkinInfo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.mojo; import java.util.ArrayList; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -21,7 +21,6 @@ package org.ajax4jsf.builder.mojo; -import java.io.File; /** * @author shura @@ -39,7 +38,7 @@ private String _displayName; - private String _tlibVersion = "1.2"; + private String _tlibVersion = null; private String _jspVersion ; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/velocity/ResourceLoader.java =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/velocity/ResourceLoader.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/velocity/ResourceLoader.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * + * 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.ajax4jsf.builder.velocity; import java.io.InputStream; Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-bottom-cell { - } - .rich-cal-day { - } - .rich-calendar-boundary-dates { - } - .rich-calendar-btn { - } - .rich-calendar-button { - } - .rich-calendar-cell { - } - .rich-calendar-cell-content { - } - .rich-calendar-cell-div { - } - .rich-calendar-cell-size { - } - .rich-calendar-date-layout { - } - .rich-calendar-date-layout-cancel { - } - .rich-calendar-date-layout-ok { - } - .rich-calendar-date-layout-split { - } - .rich-calendar-days { - } - .rich-calendar-editor-btn { - } - .rich-calendar-editor-btn-over { - } - .rich-calendar-editor-btn-selected { - } - .rich-calendar-editor-container { - } - .rich-calendar-editor-layout-shadow { - } - .rich-calendar-editor-shadow { - } - .rich-calendar-editor-tool-over { - } - .rich-calendar-editor-tool-press { - } - .rich-calendar-exterior { - } - .rich-calendar-footer { - } - .rich-calendar-footer-optional { - } - .rich-calendar-header { - } - .rich-calendar-header-optional { - } - .rich-calendar-holly { - } - .rich-calendar-hover { - } - .rich-calendar-input { - } - .rich-calendar-month { - } - .rich-calendar-popup { - } - .rich-calendar-select { - } - .rich-calendar-spec { - } - .rich-calendar-spinner-buttons { - } - .rich-calendar-spinner-down { - } - .rich-calendar-spinner-input { - } - .rich-calendar-spinner-input-container { - } - .rich-calendar-spinner-pressed { - } - .rich-calendar-spinner-up { - } - .rich-calendar-time-btn { - } - .rich-calendar-time-btn-press { - } - .rich-calendar-time-input { - } - .rich-calendar-time-layout { - } - .rich-calendar-time-layout-cancel { - } - .rich-calendar-time-layout-fields { - } - .rich-calendar-time-layout-ok { - } - .rich-calendar-today { - } - .rich-calendar-tool { - } - .rich-calendar-tool-btn { - } - .rich-calendar-tool-btn-hover { - } - .rich-calendar-tool-btn-press { - } - .rich-calendar-tool-close { - } - .rich-calendar-toolfooter { - } - .rich-calendar-week { - } - .rich-calendar-weekends { - } - .rich-right-cell { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/calendar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-bottom-cell { + } + .rich-calendar-boundary-dates { + } + .rich-calendar-btn { + } + .rich-calendar-button { + } + .rich-calendar-cell { + } + .rich-calendar-cell-div { + } + .rich-calendar-cell-size { + } + .rich-calendar-date-layout { + } + .rich-calendar-date-layout-cancel { + } + .rich-calendar-date-layout-ok { + } + .rich-calendar-date-layout-split { + } + .rich-calendar-days { + } + .rich-calendar-editor-btn { + } + .rich-calendar-editor-btn-over { + } + .rich-calendar-editor-btn-selected { + } + .rich-calendar-editor-container { + } + .rich-calendar-editor-layout-shadow { + } + .rich-calendar-editor-shadow { + } + .rich-calendar-editor-tool-over { + } + .rich-calendar-editor-tool-press { + } + .rich-calendar-exterior { + } + .rich-calendar-footer { + } + .rich-calendar-footer-optional { + } + .rich-calendar-header { + } + .rich-calendar-header-optional { + } + .rich-calendar-holly { + } + .rich-calendar-hover { + } + .rich-calendar-input { + } + .rich-calendar-month { + } + .rich-calendar-popup { + } + .rich-calendar-select { + } + .rich-calendar-spinner-buttons { + } + .rich-calendar-spinner-down { + } + .rich-calendar-spinner-input { + } + .rich-calendar-spinner-input-container { + } + .rich-calendar-spinner-pressed { + } + .rich-calendar-spinner-up { + } + .rich-calendar-time-btn { + } + .rich-calendar-time-btn-press { + } + .rich-calendar-time-layout { + } + .rich-calendar-time-layout-cancel { + } + .rich-calendar-time-layout-fields { + } + .rich-calendar-time-layout-ok { + } + .rich-calendar-today { + } + .rich-calendar-tool { + } + .rich-calendar-tool-btn { + } + .rich-calendar-tool-btn-disabled { + } + .rich-calendar-tool-btn-hover { + } + .rich-calendar-tool-btn-press { + } + .rich-calendar-tool-close { + } + .rich-calendar-toolfooter { + } + .rich-calendar-week { + } + .rich-calendar-weekends { + } + .rich-right-cell { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-colorPicker-cancel { + } + .rich-colorPicker-color { + } + .rich-colorPicker-colors-input { + } + .rich-colorPicker-current-color { + } + .rich-colorPicker-ext { + } + .rich-colorPicker-focus { + } + .rich-colorPicker-hex-wrapper { + } + .rich-colorPicker-hsb-b { + } + .rich-colorPicker-hsb-h { + } + .rich-colorPicker-hsb-s { + } + .rich-colorPicker-hsb-wrapper { + } + .rich-colorPicker-icon { + } + .rich-colorPicker-new-color { + } + .rich-colorPicker-rainbow { + } + .rich-colorPicker-rgb-b { + } + .rich-colorPicker-rgb-g { + } + .rich-colorPicker-rgb-r { + } + .rich-colorPicker-rgb-wrapper { + } + .rich-colorPicker-span { + } + .rich-colorPicker-submit { + } + .rich-colorPicker-wrapper { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/columns.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/columns.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/columns.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-combobox { - } - .rich-combobox-button { - } - .rich-combobox-button-background { - } - .rich-combobox-button-background-disabled { - } - .rich-combobox-button-background-inactive { - } - .rich-combobox-button-disabled { - } - .rich-combobox-button-hovered { - } - .rich-combobox-button-icon { - } - .rich-combobox-button-icon-disabled { - } - .rich-combobox-button-icon-inactive { - } - .rich-combobox-button-inactive { - } - .rich-combobox-button-pressed { - } - .rich-combobox-button-pressed-background { - } - .rich-combobox-font { - } - .rich-combobox-font-disabled { - } - .rich-combobox-font-inactive { - } - .rich-combobox-input { - } - .rich-combobox-input-disabled { - } - .rich-combobox-input-inactive { - } - .rich-combobox-item { - } - .rich-combobox-item-normal { - } - .rich-combobox-item-selected { - } - .rich-combobox-list-cord { - } - .rich-combobox-list-decoration { - } - .rich-combobox-list-position { - } - .rich-combobox-list-scroll { - } - .rich-combobox-list-width { - } - .rich-combobox-shadow { - } - .rich-combobox-shadow-bl { - } - .rich-combobox-shadow-br { - } - .rich-combobox-shadow-tl { - } - .rich-combobox-shadow-tr { - } - .rich-combobox-shell { - } - .rich-combobox-strut { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/combobox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-combobox { + } + .rich-combobox-button { + } + .rich-combobox-button-background { + } + .rich-combobox-button-background-disabled { + } + .rich-combobox-button-background-inactive { + } + .rich-combobox-button-disabled { + } + .rich-combobox-button-hovered { + } + .rich-combobox-button-icon { + } + .rich-combobox-button-icon-disabled { + } + .rich-combobox-button-icon-inactive { + } + .rich-combobox-button-inactive { + } + .rich-combobox-button-pressed-background { + } + .rich-combobox-font { + } + .rich-combobox-font-disabled { + } + .rich-combobox-font-inactive { + } + .rich-combobox-input { + } + .rich-combobox-input-disabled { + } + .rich-combobox-input-inactive { + } + .rich-combobox-item { + } + .rich-combobox-item-normal { + } + .rich-combobox-item-selected { + } + .rich-combobox-list-cord { + } + .rich-combobox-list-decoration { + } + .rich-combobox-list-position { + } + .rich-combobox-list-scroll { + } + .rich-combobox-list-width { + } + .rich-combobox-shadow { + } + .rich-combobox-shadow-bl { + } + .rich-combobox-shadow-br { + } + .rich-combobox-shadow-tl { + } + .rich-combobox-shadow-tr { + } + .rich-combobox-shell { + } + .rich-combobox-strut { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/component-control.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/component-control.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/component-control.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-cm-attached { - } - .rich-menu-list-border { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-cm-attached { + } + .rich-menu-list-border { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/core.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/core.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/core.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,11 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <f:verbatim> <![CDATA[ - .rich-box-bgcolor-additional { } .rich-box-bgcolor-edit { @@ -64,12 +62,24 @@ } .rich-button { } + .rich-button-button { + } + .rich-button-button-disabled { + } .rich-button-disabled { } .rich-button-over { } .rich-button-press { } + .rich-button-reset { + } + .rich-button-reset-disabled { + } + .rich-button-submit { + } + .rich-button-submit-disabled { + } .rich-container { } .rich-field { @@ -110,16 +120,40 @@ } .rich-hr { } + .rich-input { + } .rich-input-button { } + .rich-input-button-disabled { + } + .rich-input-password { + } + .rich-input-password-disabled { + } + .rich-input-reset { + } + .rich-input-reset-disabled { + } + .rich-input-submit { + } + .rich-input-submit-disabled { + } + .rich-input-text { + } + .rich-input-text-disabled { + } .rich-isindex { } + .rich-keygen { + } .rich-legend { } .rich-link { } .rich-select { } + .rich-select-disabled { + } .rich-text-color-general { } .rich-text-color-header { @@ -144,7 +178,12 @@ } .rich-textarea { } + .rich-textarea-disabled { + } + .rich-textarea-textarea { + } + .rich-textarea-textarea-disabled { + } ]]> </f:verbatim> - -</f:template> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-dataFilterSlider-container { - } - .rich-dataFilterSlider-handle { - } - .rich-dataFilterSlider-input-field { - } - .rich-dataFilterSlider-range { - } - .rich-dataFilterSlider-range-decor { - } - .rich-dataFilterSlider-track { - } - .rich-dataFilterSlider-trailer { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-dataFilterSlider-container { + } + .rich-dataFilterSlider-handle { + } + .rich-dataFilterSlider-input-field { + } + .rich-dataFilterSlider-range { + } + .rich-dataFilterSlider-range-decor { + } + .rich-dataFilterSlider-track { + } + .rich-dataFilterSlider-trailer { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-datalist { - } - .rich-definition { - } - .rich-definition-term { - } - .rich-deflist { - } - .rich-filter-input { - } - .rich-inplace-view { - } - .rich-list-item { - } - .rich-orderedlist { - } - .rich-sort-asc { - } - .rich-sort-desc { - } - .rich-subtable- { - } - .rich-subtable-cell { - } - .rich-subtable-firstrow { - } - .rich-subtable-row { - } - .rich-table { - } - .rich-table-caption { - } - .rich-table-cell { - } - .rich-table-firstrow { - } - .rich-table-footer { - } - .rich-table-footer-continue { - } - .rich-table-footercell { - } - .rich-table-header { - } - .rich-table-header-continue { - } - .rich-table-headercell { - } - .rich-table-row { - } - .rich-table-subfooter { - } - .rich-table-subfootercell { - } - .rich-table-subheader { - } - .rich-table-subheadercell { - } - .rich-tablerow { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-datalist { + } + .rich-definition { + } + .rich-definition-term { + } + .rich-deflist { + } + .rich-filter-input { + } + .rich-inplace-view { + } + .rich-list-item { + } + .rich-orderedlist { + } + .rich-sort-icon { + } + .rich-subtable- { + } + .rich-subtable-cell { + } + .rich-subtable-firstrow { + } + .rich-subtable-row { + } + .rich-table { + } + .rich-table-caption { + } + .rich-table-cell { + } + .rich-table-firstrow { + } + .rich-table-footer { + } + .rich-table-footer-continue { + } + .rich-table-footercell { + } + .rich-table-header { + } + .rich-table-header-continue { + } + .rich-table-headercell { + } + .rich-table-row { + } + .rich-table-subfooter { + } + .rich-table-subfootercell { + } + .rich-table-subheader { + } + .rich-table-subheadercell { + } + .rich-tablerow { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-datascr { - } - .rich-datascr-act { - } - .rich-datascr-button { - } - .rich-datascr-button-dsbld { - } - .rich-datascr-ctrls-separator { - } - .rich-datascr-inact { - } - .rich-dtascroller-table { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-datascr { + } + .rich-datascr-act { + } + .rich-datascr-button { + } + .rich-datascr-button-dsbld { + } + .rich-datascr-ctrls-separator { + } + .rich-datascr-inact { + } + .rich-dtascroller-table { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-dragindicator-iframe { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-dragindicator-iframe { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-ddmenu-label { - } - .rich-ddmenu-label-disabled { - } - .rich-ddmenu-label-unselect { - } - .rich-label-text-decor { - } - .rich-menu-list-border { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-ddmenu-label { + } + .rich-ddmenu-label-disabled { + } + .rich-ddmenu-label-unselect { + } + .rich-label-text-decor { + } + .rich-menu-list-border { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/editor.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/editor.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/editor.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/editor.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-editor { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/effect.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/effect.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/effect.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-dragindicator-iframe { + } + .rich-extdt-caption { + } + .rich-extdt-cell { + } + .rich-extdt-firstrow { + } + .rich-extdt-footer { + } + .rich-extdt-footer-continue { + } + .rich-extdt-footercell { + } + .rich-extdt-group-cell { + } + .rich-extdt-header { + } + .rich-extdt-header-continue { + } + .rich-extdt-headercell { + } + .rich-extdt-maindiv { + } + .rich-extdt-row { + } + .rich-extdt-subfooter { + } + .rich-extdt-subfootercell { + } + .rich-extdt-subheader { + } + .rich-extdt-subheadercell { + } + .rich-filter-input { + } + .rich-sdt-row-active { + } + .rich-sdt-row-selected { + } + .rich-table { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-file-upload-button { - } - .rich-file-upload-font { - } - .rich-fileupload-anc { - } - .rich-fileupload-button { - } - .rich-fileupload-button-border { - } - .rich-fileupload-button-content { - } - .rich-fileupload-button-dis { - } - .rich-fileupload-button-light { - } - .rich-fileupload-button-press { - } - .rich-fileupload-button-selection { - } - .rich-fileupload-del { - } - .rich-fileupload-enrty-dis { - } - .rich-fileupload-font { - } - .rich-fileupload-hidden { - } - .rich-fileupload-ico { - } - .rich-fileupload-ico-add { - } - .rich-fileupload-ico-add-dis { - } - .rich-fileupload-ico-clear { - } - .rich-fileupload-ico-clear-dis { - } - .rich-fileupload-ico-start { - } - .rich-fileupload-ico-start-dis { - } - .rich-fileupload-ico-stop { - } - .rich-fileupload-ico-stop-dis { - } - .rich-fileupload-list-decor { - } - .rich-fileupload-list-overflow { - } - .rich-fileupload-name { - } - .rich-fileupload-name-padding { - } - .rich-fileupload-scroll { - } - .rich-fileupload-table-td { - } - .rich-fileupload-toolbar-decor { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-file-upload-button { + } + .rich-file-upload-font { + } + .rich-fileupload-anc { + } + .rich-fileupload-button { + } + .rich-fileupload-button-border { + } + .rich-fileupload-button-content { + } + .rich-fileupload-button-dis { + } + .rich-fileupload-button-light { + } + .rich-fileupload-button-press { + } + .rich-fileupload-del { + } + .rich-fileupload-font { + } + .rich-fileupload-hidden { + } + .rich-fileupload-ico { + } + .rich-fileupload-ico-add { + } + .rich-fileupload-ico-add-dis { + } + .rich-fileupload-ico-clear { + } + .rich-fileupload-ico-clear-dis { + } + .rich-fileupload-ico-start { + } + .rich-fileupload-ico-start-dis { + } + .rich-fileupload-ico-stop { + } + .rich-fileupload-ico-stop-dis { + } + .rich-fileupload-list-decor { + } + .rich-fileupload-list-overflow { + } + .rich-fileupload-name { + } + .rich-fileupload-name-padding { + } + .rich-fileupload-scroll { + } + .rich-fileupload-table-td { + } + .rich-fileupload-toolbar-decor { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/functions.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/functions.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/functions.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-gmap { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/gmap.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-gmap { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-inplace { - } - .rich-inplace- { - } - .rich-inplace-changed { - } - .rich-inplace-control { - } - .rich-inplace-control-press { - } - .rich-inplace-controls-press { - } - .rich-inplace-edit { - } - .rich-inplace-field { - } - .rich-inplace-input- { - } - .rich-inplace-input-changed-hover { - } - .rich-inplace-input-controls-set { - } - .rich-inplace-input-strut { - } - .rich-inplace-input-view-hover { - } - .rich-inplace-shadow { - } - .rich-inplace-shadow-bl { - } - .rich-inplace-shadow-br { - } - .rich-inplace-shadow-size { - } - .rich-inplace-shadow-tl { - } - .rich-inplace-shadow-tr { - } - .rich-inplace-view { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-inplace { + } + .rich-inplace-changed { + } + .rich-inplace-control { + } + .rich-inplace-control-press { + } + .rich-inplace-edit { + } + .rich-inplace-field { + } + .rich-inplace-input- { + } + .rich-inplace-input-changed-hover { + } + .rich-inplace-input-controls-set { + } + .rich-inplace-input-view-hover { + } + .rich-inplace-shadow { + } + .rich-inplace-shadow-bl { + } + .rich-inplace-shadow-br { + } + .rich-inplace-shadow-size { + } + .rich-inplace-shadow-tl { + } + .rich-inplace-shadow-tr { + } + .rich-inplace-view { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-inplace-select { - } - .rich-inplace-select-arrow { - } - .rich-inplace-select-changed { - } - .rich-inplace-select-changed-hover { - } - .rich-inplace-select-control { - } - .rich-inplace-select-control-press { - } - .rich-inplace-select-control-set { - } - .rich-inplace-select-edit { - } - .rich-inplace-select-field { - } - .rich-inplace-select-font { - } - .rich-inplace-select-item { - } - .rich-inplace-select-list-decoration { - } - .rich-inplace-select-list-position { - } - .rich-inplace-select-list-scroll { - } - .rich-inplace-select-list-shadow { - } - .rich-inplace-select-selected-item { - } - .rich-inplace-select-shadow { - } - .rich-inplace-select-shadow-bl { - } - .rich-inplace-select-shadow-br { - } - .rich-inplace-select-shadow-size { - } - .rich-inplace-select-shadow-tl { - } - .rich-inplace-select-shadow-tr { - } - .rich-inplace-select-view { - } - .rich-inplace-select-view-hover { - } - .rich-inplace-select-width-list { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-inplace-select { + } + .rich-inplace-select-arrow { + } + .rich-inplace-select-changed { + } + .rich-inplace-select-changed-hover { + } + .rich-inplace-select-control { + } + .rich-inplace-select-control-press { + } + .rich-inplace-select-control-set { + } + .rich-inplace-select-edit { + } + .rich-inplace-select-field { + } + .rich-inplace-select-font { + } + .rich-inplace-select-item { + } + .rich-inplace-select-list-decoration { + } + .rich-inplace-select-list-position { + } + .rich-inplace-select-list-scroll { + } + .rich-inplace-select-list-shadow { + } + .rich-inplace-select-selected-item { + } + .rich-inplace-select-shadow { + } + .rich-inplace-select-shadow-bl { + } + .rich-inplace-select-shadow-br { + } + .rich-inplace-select-shadow-size { + } + .rich-inplace-select-shadow-tl { + } + .rich-inplace-select-shadow-tr { + } + .rich-inplace-select-view { + } + .rich-inplace-select-view-hover { + } + .rich-inplace-select-width-list { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-slider.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-slider.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-slider.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,17 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <f:verbatim> <![CDATA[ - .rich-inslider-field { } .rich-inslider-handler { } .rich-inslider-handler-selected { } + .rich-inslider-handler-selected-vertical { + } + .rich-inslider-handler-vertical { + } .rich-inslider-left-num { } .rich-inslider-right-num { @@ -20,9 +22,10 @@ } .rich-inslider-track { } + .rich-inslider-track-border { + } .rich-slider { } ]]> </f:verbatim> - -</f:template> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-spinner-button { - } - .rich-spinner-buttons { - } - .rich-spinner-c { - } - .rich-spinner-input { - } - .rich-spinner-input-container { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-spinner-button { + } + .rich-spinner-buttons { + } + .rich-spinner-c { + } + .rich-spinner-input { + } + .rich-spinner-input-container { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/insert.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/insert.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/insert.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/j-query.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/j-query.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/j-query.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/layout.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/layout.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/layout.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/layout.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-page { + } + .rich-page-body { + } + .rich-page-content { + } + .rich-page-footer { + } + .rich-page-footer-content { + } + .rich-page-header { + } + .rich-page-header-content { + } + .rich-page-main { + } + .rich-page-sidebar { + } + .rich-page-subheader { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/list-shuttle.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/list-shuttle.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/list-shuttle.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,41 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <f:verbatim> <![CDATA[ - .rich-list-shuttle { } .rich-list-shuttle-button { } - .rich-list-shuttle-button-content { - } - .rich-list-shuttle-button-disabled { - } - .rich-list-shuttle-button-layout { - } - .rich-list-shuttle-button-light { - } - .rich-list-shuttle-button-press { - } - .rich-list-shuttle-button-valign { - } .rich-list-shuttle-caption { } .rich-shuttle-body { } .rich-shuttle-control { } - .rich-shuttle-control-removeall { - } .rich-shuttle-controls { } .rich-shuttle-header-tab-cell { } - .rich-shuttle-header-tab-cell-last { - } .rich-shuttle-internal-header-tab { } .rich-shuttle-internal-tab { @@ -98,5 +80,4 @@ } ]]> </f:verbatim> - -</f:template> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-ddmenu-label-select { - } - .rich-ddmenu-label-unselect { - } - .rich-menu-group { - } - .rich-menu-group-disabled { - } - .rich-menu-group-folder { - } - .rich-menu-group-hover { - } - .rich-menu-group-icon { - } - .rich-menu-group-icon-selected { - } - .rich-menu-group-label { - } - .rich-menu-group-label-selected { - } - .rich-menu-item { - } - .rich-menu-item-disabled { - } - .rich-menu-item-enabled { - } - .rich-menu-item-folder { - } - .rich-menu-item-folder-disabled { - } - .rich-menu-item-hover { - } - .rich-menu-item-icon { - } - .rich-menu-item-icon-disabled { - } - .rich-menu-item-icon-enabled { - } - .rich-menu-item-icon-selected { - } - .rich-menu-item-label { - } - .rich-menu-item-label-disabled { - } - .rich-menu-item-label-selected { - } - .rich-menu-list-bg { - } - .rich-menu-list-strut { - } - .rich-menu-separator { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-ddmenu-label-select { + } + .rich-ddmenu-label-unselect { + } + .rich-menu-group { + } + .rich-menu-group-disabled { + } + .rich-menu-group-enabled { + } + .rich-menu-group-folder { + } + .rich-menu-group-hover { + } + .rich-menu-group-icon { + } + .rich-menu-group-icon-selected { + } + .rich-menu-group-label { + } + .rich-menu-group-label-selected { + } + .rich-menu-item { + } + .rich-menu-item-disabled { + } + .rich-menu-item-enabled { + } + .rich-menu-item-folder { + } + .rich-menu-item-folder-disabled { + } + .rich-menu-item-hover { + } + .rich-menu-item-icon { + } + .rich-menu-item-icon-disabled { + } + .rich-menu-item-icon-enabled { + } + .rich-menu-item-icon-selected { + } + .rich-menu-item-label { + } + .rich-menu-item-label-disabled { + } + .rich-menu-item-label-selected { + } + .rich-menu-list-bg { + } + .rich-menu-list-strut { + } + .rich-menu-separator { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-message { - } - .rich-message-label { - } - .rich-message-marker { - } - .rich-messages { - } - .rich-messages-label { - } - .rich-messages-marker { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/message.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-message { + } + .rich-message-label { + } + .rich-message-marker { + } + .rich-messages { + } + .rich-messages-label { + } + .rich-messages-marker { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-modalpanel { - } - .rich-mp-content { - } - .rich-mpnl-body { - } - .rich-mpnl-controls { - } - .rich-mpnl-header { - } - .rich-mpnl-header-cell { - } - .rich-mpnl-mask-div { - } - .rich-mpnl-resizer { - } - .rich-mpnl-shadow { - } - .rich-mpnl-text { - } - .rich-mpnl_panel { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-modalpanel { + } + .rich-mp-container { + } + .rich-mp-content { + } + .rich-mp-content-table { + } + .rich-mpnl-body { + } + .rich-mpnl-controls { + } + .rich-mpnl-header { + } + .rich-mpnl-header-cell { + } + .rich-mpnl-mask-div { + } + .rich-mpnl-resizer { + } + .rich-mpnl-shadow { + } + .rich-mpnl-text { + } + .rich-mpnl_panel { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/ordering-list.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/ordering-list.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/ordering-list.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,27 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <f:verbatim> <![CDATA[ - .rich-ordering-control { } .rich-ordering-control- { } - .rich-ordering-control-bottom { - } - .rich-ordering-control-disabled { - } - .rich-ordering-control-down { - } .rich-ordering-control-img { } - .rich-ordering-control-top { - } - .rich-ordering-control-up { - } .rich-ordering-list-active { } .rich-ordering-list-body { @@ -30,18 +18,8 @@ } .rich-ordering-list-button-content { } - .rich-ordering-list-button-dis { - } - .rich-ordering-list-button-disabled { - } .rich-ordering-list-button-layout { } - .rich-ordering-list-button-light { - } - .rich-ordering-list-button-press { - } - .rich-ordering-list-button-selection { - } .rich-ordering-list-button-valign { } .rich-ordering-list-caption { @@ -86,9 +64,6 @@ } .rich-ordering-list-table-header-cell { } - .rich-ordering-list-table-header-cell-last { - } ]]> </f:verbatim> - -</f:template> +</f:template> \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/paint2d.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/paint2d.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/paint2d.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <f:verbatim> <![CDATA[ - .rich-paint2D { } ]]> </f:verbatim> - -</f:template> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-panel { - } - .rich-panel-body { - } - .rich-panel-header { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-panel { + } + .rich-panel-body { + } + .rich-panel-header { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-panelbar { - } - .rich-panelbar-content { - } - .rich-panelbar-header { - } - .rich-panelbar-header-act { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelbar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-panelbar { + } + .rich-panelbar-content { + } + .rich-panelbar-content-exterior { + } + .rich-panelbar-header { + } + .rich-panelbar-header-act { + } + .rich-panelbar-interior { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelmenu.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelmenu.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/panelmenu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,11 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <f:verbatim> <![CDATA[ - .rich-pmenu { } .rich-pmenu-disabled-element { @@ -42,5 +40,4 @@ } ]]> </f:verbatim> - -</f:template> +</f:template> \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/pick-list.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/pick-list.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/pick-list.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,39 +1,21 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <f:verbatim> <![CDATA[ - .rich-list-picklist { } .rich-list-picklist-button { } - .rich-list-picklist-button-a-disabled { + .rich-list-picklist-disabled { } - .rich-list-picklist-button-content { - } - .rich-list-picklist-button-disabled { - } - .rich-list-picklist-button-layout { - } - .rich-list-picklist-button-light { - } - .rich-list-picklist-button-press { - } - .rich-list-picklist-button-selection { - } - .rich-list-picklist-button-valign { - } .rich-picklist-body { } .rich-picklist-control { } .rich-picklist-control-img { } - .rich-picklist-control-removeall { - } .rich-picklist-controls { } .rich-picklist-internal-tab { @@ -88,5 +70,4 @@ } ]]> </f:verbatim> - -</f:template> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-progress-bar { - } - .rich-progress-bar-block { - } - .rich-progress-bar-completed { - } - .rich-progress-bar-height { - } - .rich-progress-bar-height-dig { - } - .rich-progress-bar-padding { - } - .rich-progress-bar-remained { - } - .rich-progress-bar-shell { - } - .rich-progress-bar-shell-dig { - } - .rich-progress-bar-uploaded { - } - .rich-progress-bar-uploaded-dig { - } - .rich-progress-bar-width { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-progress-bar { + } + .rich-progress-bar-block { + } + .rich-progress-bar-completed { + } + .rich-progress-bar-height { + } + .rich-progress-bar-height-dig { + } + .rich-progress-bar-padding { + } + .rich-progress-bar-remained { + } + .rich-progress-bar-shell { + } + .rich-progress-bar-shell-dig { + } + .rich-progress-bar-uploaded { + } + .rich-progress-bar-uploaded-dig { + } + .rich-progress-bar-width { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-sdt { - } - .rich-sdt-column-cell { - } - .rich-sdt-column-sort-down { - } - .rich-sdt-column-sort-up { - } - .rich-sdt-fake-r { - } - .rich-sdt-footer-cell { - } - .rich-sdt-footer-sort-down { - } - .rich-sdt-footer-sort-up { - } - .rich-sdt-header-cell { - } - .rich-sdt-header-sort-down { - } - .rich-sdt-header-sort-up { - } - .rich-sdt-hsep { - } - .rich-sdt-row { - } - .rich-sdt-row-active { - } - .rich-sdt-row-selected { - } - .rich-std-footer-row { - } - .rich-std-header-row { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-sdt { + } + .rich-sdt-column-cell { + } + .rich-sdt-column-sort-down { + } + .rich-sdt-column-sort-up { + } + .rich-sdt-fake-r { + } + .rich-sdt-footer-cell { + } + .rich-sdt-footer-sort-down { + } + .rich-sdt-footer-sort-up { + } + .rich-sdt-header-cell { + } + .rich-sdt-header-sort-down { + } + .rich-sdt-header-sort-up { + } + .rich-sdt-hsep { + } + .rich-sdt-row { + } + .rich-sdt-row-active { + } + .rich-sdt-row-selected { + } + .rich-std-footer-row { + } + .rich-std-header-row { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-separator { - } - .rich-separator-image-bevel { - } - .rich-separator-image-simple { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/separator.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-separator { + } + .rich-separator-image-bevel { + } + .rich-separator-image-simple { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-stglpanel { - } - .rich-stglpanel-body { - } - .rich-stglpanel-header { - } - .rich-stglpanel-marker { - } - .rich-stglpnl-marker { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-stglpanel { + } + .rich-stglpanel-body { + } + .rich-stglpanel-header { + } + .rich-stglpanel-marker { + } + .rich-stglpnl-marker { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-spacer { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/spacer.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-spacer { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-sb-cell-padding { - } - .rich-sb-common-container { - } - .rich-sb-ext-decor-1 { - } - .rich-sb-ext-decor-2 { - } - .rich-sb-ext-decor-3 { - } - .rich-sb-int { - } - .rich-sb-int-decor-table { - } - .rich-sb-int-sel { - } - .rich-sb-overflow { - } - .rich-sb-shadow { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-sb-cell-padding { + } + .rich-sb-common-container { + } + .rich-sb-ext-decor-1 { + } + .rich-sb-ext-decor-2 { + } + .rich-sb-ext-decor-3 { + } + .rich-sb-int { + } + .rich-sb-int-decor-table { + } + .rich-sb-int-sel { + } + .rich-sb-overflow { + } + .rich-sb-shadow { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-tab-active { - } - .rich-tab-bottom-line { - } - .rich-tab-disabled { - } - .rich-tab-header { - } - .rich-tab-inactive { - } - .rich-tab-label { - } - .rich-tabhdr-cell-active { - } - .rich-tabhdr-cell-disabled { - } - .rich-tabhdr-cell-inactive { - } - .rich-tabhdr-side-border { - } - .rich-tabhdr-side-cell { - } - .rich-tabpanel { - } - .rich-tabpanel-content { - } - .rich-tabpanel-content-position { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-tab-active { + } + .rich-tab-bottom-line { + } + .rich-tab-disabled { + } + .rich-tab-header { + } + .rich-tab-inactive { + } + .rich-tabhdr-cell-active { + } + .rich-tabhdr-cell-disabled { + } + .rich-tabhdr-cell-inactive { + } + .rich-tabhdr-side-border { + } + .rich-tabhdr-side-cell { + } + .rich-tabpanel { + } + .rich-tabpanel-content { + } + .rich-tabpanel-content-position { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-tglctrl { - } - .rich-toggle-panel { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-tglctrl { + } + .rich-toggle-panel { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-toolbar { - } - .rich-toolbar-item { - } - .rich-toolbar-separator { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tool-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-toolbar { + } + .rich-toolbar-item { + } + .rich-toolbar-separator { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-tool-tip { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tooltip.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-tool-tip { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-model.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-model.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-model.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-table.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-table.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - ]]> - </f:verbatim> - -</f:template> Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-tree { - } - .rich-tree-node { - } - .rich-tree-node-children { - } - .rich-tree-node-cildren { - } - .rich-tree-node-handleicon { - } - .rich-tree-node-handleicon-collapsed { - } - .rich-tree-node-handleicon-expanded { - } - .rich-tree-node-highlighted { - } - .rich-tree-node-icon { - } - .rich-tree-node-selected { - } - .rich-tree-node-text { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/tree.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-tree { + } + .rich-tree-node { + } + .rich-tree-node-children { + } + .rich-tree-node-cildren { + } + .rich-tree-node-handle { + } + .rich-tree-node-handleicon { + } + .rich-tree-node-handleicon-collapsed { + } + .rich-tree-node-handleicon-expanded { + } + .rich-tree-node-highlighted { + } + .rich-tree-node-icon { + } + .rich-tree-node-selected { + } + .rich-tree-node-text { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f="http://jsf.exadel.com/template" - xmlns:u="http://jsf.exadel.com/template/util" - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ - - .rich-virtualEarth { - } - ]]> - </f:verbatim> - -</f:template> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml"> + <f:verbatim> + <![CDATA[ + .rich-virtualEarth { + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates/component-dependencies.vm (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/templates/component-dependencies.vm) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates/component-dependencies.vm (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates/component-dependencies.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components> + <namespace>${taglib.uri}</namespace> +${content} +</components> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components> + <namespace>${taglib.uri}</namespace> +${content} +</components> Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme) Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/component) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> - -<components> - <renderer generate="true" override="true"> - <name>${rendererType}</name> - <family>org.richfaces.Page</family> - <template>${packagePath}/${name}.jspx</template> - </renderer> -</components> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> + +<components> + <renderer generate="true" override="true"> + <name>${rendererType}</name> + <family>org.richfaces.Page</family> + <template>${packagePath}/${name}.jspx</template> + </renderer> +</components> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/css) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <u:selector name=".rich-page"> - </u:selector> - - <u:selector name=".rich-page-header"> - </u:selector> - - <u:selector name=".rich-page-footer"> - </u:selector> - - <u:selector name=".rich-page-sidebar"> - </u:selector> - - <u:selector name=".rich-page-body"> - </u:selector> - - <f:verbatim> - <![CDATA[ - .rich-page-sidebar { - float: left; - margin-bottom: 15px; - margin-right: 15px; - } - ]]> - </f:verbatim> -</f:template> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml"> + + <u:selector name=".rich-page"> + </u:selector> + + <u:selector name=".rich-page-header"> + </u:selector> + + <u:selector name=".rich-page-footer"> + </u:selector> + + <u:selector name=".rich-page-sidebar"> + </u:selector> + + <u:selector name=".rich-page-body"> + </u:selector> + + <f:verbatim> + <![CDATA[ + .rich-page-sidebar { + float: left; + margin-bottom: 15px; + margin-right: 15px; + } + ]]> + </f:verbatim> +</f:template> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/template) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://ajax4jsf.org/cdk/ui" - xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" - xmlns:h="http://jsf.exadel.com/header" - xmlns:vcp="http://ajax4jsf.org/cdk/vcp" class="${rendererClassName}" - baseclass="org.richfaces.renderkit.AbstractPageRenderer" - component="org.richfaces.component.UIPage"> - - <c:set var="namespace" value="#{this:prolog(context,component)}" /> - <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"> - <head> - <title>#{component.attributes['pageTitle']}</title> - <f:call name="themeStyle" /> - <f:call name="themeScript" /> - <style type="text/css"> - <jsp:scriptlet><![CDATA[ - Integer width = (Integer) component.getAttributes().get("width"); - - if (null != width && width.intValue() > 0) { - StringBuilder format = new StringBuilder(".rich-page{margin:auto;text-align:left;"); - format.append("width:").append(width).append("px;"); - writer.write(format.toString()); - } else { - writer.write(".rich-page{width: 100%;}\n"); - }]]></jsp:scriptlet> - </style> - - <u:insertFacet name="pageHeader" /> - </head> - <body x:passThruWithExclusions="value,name,type,id" class="rich-page"> - - <div class="rich-page-header"> - <u:insertFacet name="header" /> - </div> - - <div class="rich-page-sidebar"> - <u:insertFacet name="sidebar" /> - </div> - - <div> - <vcp:body> - <f:call name="renderChildren" /> - </vcp:body> - </div> - - <div class="rich-page-footer"> - <u:insertFacet name="footer" /> - </div> - - </body> - </html> -</f:root> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + xmlns:h="http://jsf.exadel.com/header" + xmlns:vcp="http://ajax4jsf.org/cdk/vcp" class="${rendererClassName}" + baseclass="org.richfaces.renderkit.AbstractPageRenderer" + component="org.richfaces.component.UIPage"> + + <c:set var="namespace" value="#{this:prolog(context,component)}" /> + <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"> + <head> + <title>#{component.attributes['pageTitle']}</title> + <f:call name="themeStyle" /> + <f:call name="themeScript" /> + <style type="text/css"> + <jsp:scriptlet><![CDATA[ + Integer width = (Integer) component.getAttributes().get("width"); + + if (null != width && width.intValue() > 0) { + StringBuilder format = new StringBuilder(".rich-page{margin:auto;text-align:left;"); + format.append("width:").append(width).append("px;"); + writer.write(format.toString()); + } else { + writer.write(".rich-page{width: 100%;}\n"); + }]]></jsp:scriptlet> + </style> + + <u:insertFacet name="pageHeader" /> + </head> + <body x:passThruWithExclusions="value,name,type,id" class="rich-page"> + + <div class="rich-page-header"> + <u:insertFacet name="header" /> + </div> + + <div class="rich-page-sidebar"> + <u:insertFacet name="sidebar" /> + </div> + + <div> + <vcp:body> + <f:call name="renderChildren" /> + </vcp:body> + </div> + + <div class="rich-page-footer"> + <u:insertFacet name="footer" /> + </div> + + </body> + </html> +</f:root> \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/themes) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,2 +0,0 @@ -rendererType=${rendererType} -styleSheet=resource\:///${xcssPackagePath}/${name}.xcss Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties) =================================================================== --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,2 @@ +rendererType=${rendererType} +styleSheet=resource\:///${xcssPackagePath}/${name}.xcss Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/Aggregation.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/Aggregation.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/Aggregation.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; import java.io.File; @@ -16,7 +37,8 @@ public String[] excludes; public boolean removeIncluded = false; public boolean insertNewLine = false; - + public boolean insertSemicolon = false; + public void run(File outputDirectory) throws Exception { if(null == sourceDirectory){ sourceDirectory = outputDirectory; @@ -29,6 +51,9 @@ FileInputStream in = new FileInputStream(file); try { IOUtil.copy(in, out); + if (insertSemicolon) { + out.write(';'); + } if (insertNewLine) { out.write('\n'); } Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/ErrorReporter4Mojo.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/ErrorReporter4Mojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/ErrorReporter4Mojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; import org.apache.maven.plugin.logging.Log; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintChecker.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintChecker.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintChecker.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/JSLintMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/MojoSupport.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/MojoSupport.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/MojoSupport.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/SourceFile.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/SourceFile.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/SourceFile.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/test/java/net/sf/alchim/mojo/yuicompressor/AggregationTestCase.java =================================================================== --- branches/jsf2.0/cdk/maven-javascript-plugin/src/test/java/net/sf/alchim/mojo/yuicompressor/AggregationTestCase.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/test/java/net/sf/alchim/mojo/yuicompressor/AggregationTestCase.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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 net.sf.alchim.mojo.yuicompressor; import java.io.File; Copied: branches/jsf2.0/cdk/maven-resource-dependency-plugin (from rev 14244, branches/community/3.3.X/cdk/maven-resource-dependency-plugin) Modified: branches/jsf2.0/cdk/maven-resource-dependency-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-resource-dependency-plugin/pom.xml 2009-05-19 22:58:34 UTC (rev 14245) @@ -3,7 +3,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.2-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -12,7 +12,7 @@ <artifactId>maven-resource-dependency-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>3.3.2-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <name>maven-resource-dependency-plugin</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/jsf2.0/framework/jsf-test/pom.xml =================================================================== --- branches/jsf2.0/framework/jsf-test/pom.xml 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/framework/jsf-test/pom.xml 2009-05-19 22:58:34 UTC (rev 14245) @@ -15,12 +15,12 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.5</version> + <version>4.6</version> </dependency> <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <dependency> <groupId>com.sun.faces</groupId> @@ -40,7 +40,7 @@ <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit-core-js</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <dependency> <groupId>net.sourceforge.cssparser</groupId> @@ -65,7 +65,7 @@ <dependency> <groupId>net.sourceforge.nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.11</version> + <version>1.9.12</version> <exclusions> <exclusion> <groupId>xml-apis</groupId>