richfaces-svn-commits May 2009

richfaces-svn-commits@lists.jboss.org

1 participants
430 discussions

JBoss Rich Faces SVN: r14245 - in branches/jsf2.0: cdk/generator/src/main/java/org/ajax4jsf/builder/config and 26 other directories.

by richfaces-svn-commits＠lists.jboss.org

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 @@  <!ELEMENT superclass (#PCDATA)>  -<!ELEMENT renderer (name,(classname|template),superclass?,description?,displayname?,icon?,facet?,renderkit?)> +<!ELEMENT renderer (name,family?,(classname|template),superclass?,description?,displayname?,icon?,facet?,renderkit?)>  <!ELEMENT renderkit (#PCDATA)>  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> <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 "required" facility, if the "required" 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=<themeName> [ -Dpackage=<themePackage> ]</tt></p> + * This adds new theme named <themeName> 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>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14244 - branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2009-05-19 13:29:15 -0400 (Tue, 19 May 2009) New Revision: 14244 Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userShelves.xhtml Log: Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userShelves.xhtml =================================================================== (Binary files differ)

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14243 - in branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum: domain and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2009-05-19 13:28:16 -0400 (Tue, 19 May 2009) New Revision: 14243 Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchAction.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchAction.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothAlbumsStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothImagesStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothShelvesStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchEntityEnum.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMetatagsStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyAlbumsStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyImagesStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyShelvesStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchQueryFactory.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedAlbumsStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedImagesStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedShelvesStrategy.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchUserStrategy.java Removed: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/ISearchAction.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/SearchAction.java Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java Log: Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java 2009-05-19 17:27:59 UTC (rev 14242) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -80,7 +80,7 @@ @OneToOne(fetch = FetchType.LAZY) private Image coveringImage; - @Temporal(TemporalType.TIMESTAMP) + @Temporal(TemporalType.DATE) private Date created; @Column(length = 255, nullable = false) Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java 2009-05-19 17:27:59 UTC (rev 14242) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -56,7 +56,7 @@ @NotNull private boolean shared; - @Temporal(TemporalType.TIMESTAMP) + @Temporal(TemporalType.DATE) private Date created; /** Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchAction.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchAction.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchAction.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,51 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.List; + +import javax.ejb.Local; + +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.PhotoAlbumException; + +/** + * Interface for search actions + * + * @author Andrey Markhel + */ +@Local +public interface ISearchAction { + public List<Image> searchByImage(String query, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException; + + public List<MetaTag> searchByTags(String query, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException; + + public List<Album> searchByAlbum(String query, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException; + + public List<User> searchByUsers(String query, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException; + + public List<Shelf> searchByShelves(String query,boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException; + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,56 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * 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 + */ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; +/** + * Generic interface for determine what query need for particular entity and other parameters + * + * + * @author Andrey Markhel + */ +public interface ISearchStrategy { + + public abstract Query getQuery(EntityManager em, Map<String, Object> params, String name); +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/ISearchStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchAction.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchAction.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchAction.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,166 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * 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 + */ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.List; + +import javax.ejb.Stateless; +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.PhotoAlbumException; + +/** + * This class is entry point to retrieve search result + * EJB3 Bean + * + * @author Andrey Markhel + */ + +@Name("searchAction") +@Stateless +@AutoCreate +@SuppressWarnings("unchecked") +public class SearchAction implements ISearchAction { + + @In(value="entityManager") + EntityManager em; + + @In SearchQueryFactory searchQueryFactory; + + @In private User user; + + /** + * Return List of albums, founded by query + * Search albums by name and description(like) + * @param searchQuery - string to search + * @param searchInMyAlbums - determine is search will be making by only user's albums + * @param searchInShared - determine is search will be making in only shared albums + * @return list of founded albums + * @throws PhotoAlbumException if search parameter is wrong + */ + public List<Album> searchByAlbum(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { + Query query = searchQueryFactory.getQuery(SearchEntityEnum.ALBUM, user, searchInShared, searchInMyAlbums, searchQuery); + if(null == query){ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + return (List<Album>)query.getResultList(); + } + + /** + * Return List of images, founded by query + * Search images by name and description(like) + * @param searchQuery - string to search + * @param searchInMyAlbums - determine is search will be making by only user's images + * @param searchInShared - determine is search will be making in only shared images + * @return list of founded images + * @throws PhotoAlbumException if search parameter is wrong + */ + public List<Image> searchByImage(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { + Query query = searchQueryFactory.getQuery(SearchEntityEnum.IMAGE, user, searchInShared, searchInMyAlbums, searchQuery); + if(null == query){ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + return (List<Image>)query.getResultList(); + } + + /** + * Return List of users, founded by query + * Search users by login, firstname and secondname(like) + * @param searchQuery - string to search + * @param searchInMyAlbums - unused + * @param searchInShared - unused + * @return list of founded users + * @throws PhotoAlbumException if search parameter is wrong + */ + public List<User> searchByUsers(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { + Query query = searchQueryFactory.getQuery(SearchEntityEnum.USER, user, searchInShared, searchInMyAlbums, searchQuery); + if(null == query){ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + return (List<User>)query.getResultList(); + } + + /** + * Return List of metatags, founded by query + * Search users by tagname(like) + * @param searchQuery - string to search + * @param searchInMyAlbums - unused + * @param searchInShared - unused + * @return list of founded metatags + * @throws PhotoAlbumException if search parameter is wrong + */ + public List<MetaTag> searchByTags(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { + Query query = searchQueryFactory.getQuery(SearchEntityEnum.METATAG, user, searchInShared, searchInMyAlbums, searchQuery); + if(null == query){ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + return (List<MetaTag>)query.getResultList(); + } + + /** + * Return List of shelves, founded by query + * Search images by name and description(like) + * @param searchQuery - string to search + * @param searchInMyAlbums - determine is search will be making by only user's shelves + * @param searchInShared - determine is search will be making in only shared shelves + * @return list of founded images + * @throws PhotoAlbumException if search parameter is wrong + */ + public List<Shelf> searchByShelves(String searchQuery, boolean searchInMyAlbums, + boolean searchInShared) throws PhotoAlbumException { + Query query = searchQueryFactory.getQuery(SearchEntityEnum.SHELF, user, searchInShared, searchInMyAlbums, searchQuery); + if(null == query){ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + return (List<Shelf>)query.getResultList(); + } + +} \ No newline at end of file Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothAlbumsStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothAlbumsStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothAlbumsStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,55 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve albums, that are shared or belongs to user, that perform search + * + * @author Andrey Markhel + */ +public class SearchBothAlbumsStrategy implements ISearchStrategy { + /** + * Create query to retrieve albums, that are shared or belongs to user, that perform search + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of albums that are shared or belongs to user, that perform search + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_ALBUM_QUERY + Constants.SEARCH_ALBUM_BOTH_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + User user = (User)params.get(Constants.USER_PARAMETER); + if(null == user){ + return null; + } + query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); + return query; + } + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothAlbumsStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothImagesStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothImagesStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothImagesStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,55 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve images, that are shared or belongs to user, that perform search + * + * @author Andrey Markhel + */ +public class SearchBothImagesStrategy implements ISearchStrategy { + /** + * Create query to retrieve images, that are shared or belongs to user, that perform search + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of images that are shared or belongs to user, that perform search + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_IMAGE_QUERY + Constants.SEARCH_IMAGE_BOTH_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + User user = (User)params.get(Constants.USER_PARAMETER); + if(null == user){ + return null; + } + query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); + return query; + } + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothImagesStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothShelvesStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothShelvesStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothShelvesStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,55 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve shelves, that are shared or belongs to user, that perform search + * + * @author Andrey Markhel + */ +public class SearchBothShelvesStrategy implements ISearchStrategy { + /** + * Create query to retrieve shelves, that are shared or belongs to user, that perform search + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of shelves that are shared or belongs to user, that perform search + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_SHELVES_QUERY + Constants.SEARCH_SHELF_BOTH_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + User user = (User)params.get(Constants.USER_PARAMETER); + if(null == user){ + return null; + } + query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); + return query; + } + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchBothShelvesStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchEntityEnum.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchEntityEnum.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchEntityEnum.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,29 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; +/** + * This enumeration represent all possible entities for search + * + * @author Andrey Markhel + */ +public enum SearchEntityEnum { + USER,SHELF,ALBUM,IMAGE,METATAG; +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchEntityEnum.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMetatagsStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMetatagsStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMetatagsStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,50 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve metatags + * + * @author Andrey Markhel + */ +public class SearchMetatagsStrategy implements ISearchStrategy { + /** + * Create query to retrieve metatags + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of metatags + */ + public Query getQuery(EntityManager em, Map<String, Object> params, + String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_METATAG_QUERY); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + return query; + } + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMetatagsStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyAlbumsStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyAlbumsStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyAlbumsStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,55 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve albums, that belongs to user, that perform search + * + * @author Andrey Markhel + */ +public class SearchMyAlbumsStrategy implements ISearchStrategy { + /** + * Create query to retrieve albums, that belongs to user, that perform search + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of albums, that belongs to user, that perform search + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_ALBUM_QUERY + Constants.SEARCH_ALBUM_MY_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + User user = (User)params.get(Constants.USER_PARAMETER); + if(null == user){ + return null; + } + query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); + return query; + } + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyAlbumsStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyImagesStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyImagesStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyImagesStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,54 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve images, that belongs to user, that perform search + * + * @author Andrey Markhel + */ +public class SearchMyImagesStrategy implements ISearchStrategy { + /** + * Create query to retrieve images, that belongs to user, that perform search + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of images, that belongs to user, that perform search + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_IMAGE_QUERY + Constants.SEARCH_IMAGE_MY_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + User user = (User)params.get(Constants.USER_PARAMETER); + if(null == user){ + return null; + } + query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); + return query; + } +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyImagesStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyShelvesStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyShelvesStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyShelvesStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,55 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve shelves, that belongs to user, that perform search + * + * @author Andrey Markhel + */ +public class SearchMyShelvesStrategy implements ISearchStrategy { + /** + * Create query to retrieve shelves, that belongs to user, that perform search + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of shelves, that belongs to user, that perform search + */ + public Query getQuery(EntityManager em, Map<String, Object> params, + String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_SHELVES_QUERY + Constants.SEARCH_SHELF_MY_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + User user = (User)params.get(Constants.USER_PARAMETER); + if(null == user){ + return null; + } + query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); + return query; + } +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchMyShelvesStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchQueryFactory.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchQueryFactory.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchQueryFactory.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,110 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.HashMap; +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Startup; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.PhotoAlbumException; +/** + * This class is factory to retrieve query object, dependent of type of searched entity and other parameters + * + * @author Andrey Markhel + */ +@Name("searchQueryFactory") +(a)Scope(ScopeType.APPLICATION) +@Startup +public class SearchQueryFactory { + @In(value="entityManager") + EntityManager em; + /** + * This method is return query object,that dependent of type of searched entity and other parameters + * + * @param entity - one of instances from SearchEntityEnum enumeration, indicate waht type of entities user want to search + * @param user - user, that perform search + * @param searchInMy - boolean parameter that indicate, is user want search in her space + * @param searchInShared - boolean parameter that indicate, is user want search in all shared entities + * @param queryString - string to search + * @throws PhotoAlbumException - in case of wrong search parameters + * @return query object, that dependent of type of searched entity and other parameters + */ + public Query getQuery(SearchEntityEnum entity, User user, boolean searchInShared, boolean searchInMy, String queryString) throws PhotoAlbumException{ + ISearchStrategy strategy = null; + Map<String, Object> parameters = new HashMap<String, Object>(); + parameters.put(Constants.USER_PARAMETER, user); + switch(entity){ + case USER:{ + strategy = new SearchUserStrategy();break; + } + case SHELF:{ + if(searchInShared && searchInMy){ + strategy = new SearchBothShelvesStrategy(); + }else if(searchInShared){ + strategy = new SearchSharedShelvesStrategy(); + }else if(searchInMy){ + strategy = new SearchMyShelvesStrategy(); + }else{ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + break; + } + case ALBUM:{ + if(searchInShared && searchInMy){ + strategy = new SearchBothAlbumsStrategy(); + }else if(searchInShared){ + strategy = new SearchSharedAlbumsStrategy(); + }else if(searchInMy){ + strategy = new SearchMyAlbumsStrategy(); + }else{ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + break; + } + case IMAGE:{ + if(searchInShared && searchInMy){ + strategy = new SearchBothImagesStrategy(); + }else if(searchInShared){ + strategy = new SearchSharedImagesStrategy(); + }else if(searchInMy){ + strategy = new SearchMyImagesStrategy(); + }else{ + throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + break; + } + case METATAG:{ + strategy = new SearchMetatagsStrategy();break; + } + default: throw new PhotoAlbumException(Constants.WRONG_SEARCH_PARAMETERS_ERROR); + } + return strategy.getQuery(em, parameters, queryString); + } +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchQueryFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedAlbumsStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedAlbumsStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedAlbumsStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,49 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve albums, that are shared + * + * @author Andrey Markhel + */ +public class SearchSharedAlbumsStrategy implements ISearchStrategy { + /** + * Create query to retrieve albums, that are shared + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of albums that are shared + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_ALBUM_QUERY + Constants.SEARCH_ALBUM_SHARED_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + return query; + } + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedAlbumsStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedImagesStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedImagesStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedImagesStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,48 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve images, that are shared + * + * @author Andrey Markhel + */ +public class SearchSharedImagesStrategy implements ISearchStrategy { + /** + * Create query to retrieve images, that are shared + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of images that are shared + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_IMAGE_QUERY + Constants.SEARCH_IMAGE_SHARED_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + return query; + } +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedImagesStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedShelvesStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedShelvesStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedShelvesStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,48 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve shelves, that are shared + * + * @author Andrey Markhel + */ +public class SearchSharedShelvesStrategy implements ISearchStrategy { + /** + * Create query to retrieve shelves, that are shared + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of shelves that are shared + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_SHELVES_QUERY + Constants.SEARCH_SHELF_SHARED_ADDON); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + return query; + } +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchSharedShelvesStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchUserStrategy.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchUserStrategy.java (rev 0) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchUserStrategy.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -0,0 +1,49 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.photoalbum.search; + +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import org.richfaces.photoalbum.service.Constants; +/** + * Strategy to retrieve users + * + * @author Andrey Markhel + */ +public class SearchUserStrategy implements ISearchStrategy { + /** + * Create query to retrieve users + * + * @param em - entityManager + * @param params - map of additional params for this query + * @param searchQuery - string to search + * @return List of users + */ + public Query getQuery(EntityManager em, Map<String, Object> params, String searchQuery) { + Query query = em.createQuery(Constants.SEARCH_USERS_QUERY); + query.setParameter(Constants.QUERY_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); + return query; + } + +} Property changes on: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/search/SearchUserStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java 2009-05-19 17:27:59 UTC (rev 14242) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -53,6 +53,7 @@ public static final String USER_DELETED_EVENT = "userDeletedEvent"; //Errors(Internationalization pending) + public static final String WRONG_SEARCH_PARAMETERS_ERROR = "Wrong search parameters"; public static final String YOU_ALREADY_DOWNLOAD_MANY_COPIES_OF_THIS_IMAGE_ERROR = "You already download 256 copies of this image. Please specify another name for uploaded image"; public static final String SAME_IMAGE_EXIST_ERROR = "You already have an image with the given name in selected album"; public static final String SAME_ALBUM_EXIST_ERROR = "You already have an album with the given name in selected shelf"; @@ -156,19 +157,22 @@ public static final String TAG_POPULAR_QUERY = "tag-popular"; public static final String TAG_PARAMETER = "tag"; public static final String TAG_BY_NAME_QUERY = "tag-byName"; - public static final String SEARCH_QUERY_SHARED_ADDON = " and sh.shared=true"; - public static final String SEARCH_QUERY_MY_ADDON = " and sh.owner.login=:login"; - public static final String SEARCH_SHELVES_QUERY = "from Shelf sh where (lower(sh.name) like :name or lower(sh.description) like :name) "; - public static final String SEARCH_METATAG_QUERY = "from MetaTag t where lower(t.tag) like :name"; - public static final String SEARCH_USERS_QUERY = "select u from User u where (lower(u.login) like :name or lower(u.firstName) like :name or lower(u.secondName) like :name) "; + public static final String SEARCH_SHELF_SHARED_ADDON = " and sh.shared=true"; + public static final String SEARCH_SHELF_MY_ADDON = " and sh.owner.login=:login"; + public static final String SEARCH_SHELF_BOTH_ADDON = " and sh.shared=true or sh.owner.login=:login"; + public static final String SEARCH_SHELVES_QUERY = "from Shelf sh where (lower(sh.name) like :queryString or lower(sh.description) like :queryString) "; + public static final String SEARCH_METATAG_QUERY = "from MetaTag t where lower(t.tag) like :queryString"; + public static final String SEARCH_USERS_QUERY = "select u from User u where (lower(u.login) like :queryString or lower(u.firstName) like :queryString or lower(u.secondName) like :queryString) "; public static final String SEARCH_IMAGE_SHARED_ADDON = " and i.album.shelf.shared=true"; public static final String SEARCH_IMAGE_MY_ADDON = " and i.album.shelf.owner.login=:login"; - public static final String SEARCH_IMAGE_QUERY = "from Image i where (lower(i.name) like :name or lower(i.description) like :name or lower(i.cameraModel) like :name) "; + public static final String SEARCH_IMAGE_BOTH_ADDON = " and i.album.shelf.shared=true or i.album.shelf.owner.login=:login"; + public static final String SEARCH_IMAGE_QUERY = "from Image i where (lower(i.name) like :queryString or lower(i.description) like :queryString or lower(i.cameraModel) like :queryString) "; public static final String SHARED_PARAMETER = "shared"; - public static final String NAME_PARAMETER = "name"; + public static final String QUERY_PARAMETER = "queryString"; public static final String SEARCH_ALBUM_SHARED_ADDON = " and a.shelf.shared=true"; public static final String SEARCH_ALBUM_MY_ADDON = " and a.shelf.owner.login=:login"; - public static final String SEARCH_ALBUM_QUERY = "from Album a where (lower(a.name) like :name or lower(a.description) like :name)"; + public static final String SEARCH_ALBUM_BOTH_ADDON = " and a.shelf.shared=true or a.shelf.owner.login=:login"; + public static final String SEARCH_ALBUM_QUERY = "from Album a where (lower(a.name) like :queryString or lower(a.description) like :queryString)"; public static final String USER_SHELVES_QUERY = "user-shelves"; public static final String SHELF_PARAMETER = "shelf"; public static final String PATH_PARAMETER = "path"; @@ -176,6 +180,7 @@ public static final String IMAGE_IDENTICAL_QUERY = "image-countIdenticalImages"; public static final String SEARCH_NO_OPTIONS_ERROR = "You must select at least one search option"; public static final String TREE_ID = "treeform"; + public static final String MAINAREA_ID = "mainform:mainArea"; public static final String USER_COMMENTS_QUERY = "user-comments"; public static final String AUTHOR_PARAMETER = "author"; public static final String EMAIL_EXIST_QUERY = "email-exist"; Deleted: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/ISearchAction.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/ISearchAction.java 2009-05-19 17:27:59 UTC (rev 14242) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/ISearchAction.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -1,50 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.richfaces.photoalbum.service; - -import java.util.List; - -import javax.ejb.Local; - -import org.richfaces.photoalbum.domain.Album; -import org.richfaces.photoalbum.domain.Image; -import org.richfaces.photoalbum.domain.MetaTag; -import org.richfaces.photoalbum.domain.Shelf; -import org.richfaces.photoalbum.domain.User; - -/** - * Interface for search actions - * - * @author Andrey Markhel - */ -@Local -public interface ISearchAction { - public List<Image> searchByImage(String query, boolean searchInMyAlbums, boolean searchInShared); - - public List<MetaTag> searchByTags(String query, boolean searchInMyAlbums, boolean searchInShared); - - public List<Album> searchByAlbum(String query, boolean searchInMyAlbums, boolean searchInShared); - - public List<User> searchByUsers(String query, boolean searchInMyAlbums, boolean searchInShared); - - public List<Shelf> searchByShelves(String query,boolean searchInMyAlbums, boolean searchInShared); - -} Deleted: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/SearchAction.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/SearchAction.java 2009-05-19 17:27:59 UTC (rev 14242) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/SearchAction.java 2009-05-19 17:28:16 UTC (rev 14243) @@ -1,184 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.richfaces.photoalbum.service; - -import java.util.List; - -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.Query; - -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.richfaces.photoalbum.domain.Album; -import org.richfaces.photoalbum.domain.Image; -import org.richfaces.photoalbum.domain.MetaTag; -import org.richfaces.photoalbum.domain.Shelf; -import org.richfaces.photoalbum.domain.User; - -/** - * Search Builder - * EJB3 Bean - * - * @author Andrey Markhel - */ - -@Name("searchAction") -@Stateless -@AutoCreate -@SuppressWarnings("unchecked") -public class SearchAction implements ISearchAction { - - @In(value="entityManager") - EntityManager em; - - @In private User user; - - /** - * Return List of albums, founded by query - * Search albums by name and description(like) - * @param searchQuery - string to search - * @param searchInMyAlbums - determine is search will be making by only user's albums - * @param searchInShared - determine is search will be making in only shared albums - * @return list of founded albums - */ - public List<Album> searchByAlbum(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) { - StringBuilder b = new StringBuilder(Constants.SEARCH_ALBUM_QUERY); - //If we search in user's albums - if (searchInMyAlbums) { - b.append(Constants.SEARCH_ALBUM_MY_ADDON); - } - //If we search only in shared albums - if(searchInShared){ - b.append(Constants.SEARCH_ALBUM_SHARED_ADDON); - } - //Create query - Query query = em.createQuery(b.toString()); - //Set search string - query.setParameter(Constants.NAME_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); - //If we search only in shared albums - //If we search in user's albums - if (searchInMyAlbums) { - query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); - } - //Get result - return query.getResultList(); - } - - /** - * Return List of images, founded by query - * Search images by name and description(like) - * @param searchQuery - string to search - * @param searchInMyAlbums - determine is search will be making by only user's images - * @param searchInShared - determine is search will be making in only shared images - * @return list of founded images - */ - public List<Image> searchByImage(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) { - StringBuilder b = new StringBuilder(Constants.SEARCH_IMAGE_QUERY); - //If we search in user's images - if (searchInMyAlbums) { - b.append(Constants.SEARCH_IMAGE_MY_ADDON); - } - //If we search only in shared images - if(searchInShared){ - b.append(Constants.SEARCH_IMAGE_SHARED_ADDON); - } - //Create query - Query query = em.createQuery(b.toString()); - //Set search string - query.setParameter(Constants.NAME_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); - //If we search only in shared images - if (searchInMyAlbums) { - query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); - } - //Get result - return query.getResultList(); - } - - /** - * Return List of users, founded by query - * Search users by login, firstname and secondname(like) - * @param searchQuery - string to search - * @param searchInMyAlbums - unused - * @param searchInShared - unused - * @return list of founded users - */ - public List<User> searchByUsers(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) { - StringBuilder b = new StringBuilder(Constants.SEARCH_USERS_QUERY); - //Create query - Query query = em.createQuery(b.toString()); - //Set search string - query.setParameter(Constants.NAME_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); - //Get result - return query.getResultList(); - } - - /** - * Return List of metatags, founded by query - * Search users by tagname(like) - * @param searchQuery - string to search - * @param searchInMyAlbums - unused - * @param searchInShared - unused - * @return list of founded metatags - */ - public List<MetaTag> searchByTags(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) { - StringBuilder b = new StringBuilder(Constants.SEARCH_METATAG_QUERY); - //Create query - Query query = em.createQuery(b.toString()); - //Set search string - query.setParameter(Constants.NAME_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); - //Get result - return query.getResultList(); - } - - /** - * Return List of shelves, founded by query - * Search images by name and description(like) - * @param searchQuery - string to search - * @param searchInMyAlbums - determine is search will be making by only user's shelves - * @param searchInShared - determine is search will be making in only shared shelves - * @return list of founded images - */ - public List<Shelf> searchByShelves(String searchQuery, boolean searchInMyAlbums, - boolean searchInShared) { - StringBuilder b = new StringBuilder(Constants.SEARCH_SHELVES_QUERY); - //If we search in user's shelves - if (searchInMyAlbums) { - b.append(Constants.SEARCH_QUERY_MY_ADDON); - } - //If we search only in shared shelves - if (searchInShared) { - b.append(Constants.SEARCH_QUERY_SHARED_ADDON); - } - //Create query - Query query = em.createQuery(b.toString()); - //If we search in user's shelves - if (searchInMyAlbums) { - query.setParameter(Constants.LOGIN_PARAMETER, user.getLogin()); - } - //Set search string - query.setParameter(Constants.NAME_PARAMETER, Constants.PERCENT + searchQuery.toLowerCase() + Constants.PERCENT); - //Get result - return query.getResultList(); - } - -} \ No newline at end of file

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14242 - in branches/community/3.3.X/examples/photoalbum/source/web/src/main: java/org/richfaces/photoalbum/search and 12 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2009-05-19 13:27:59 -0400 (Tue, 19 May 2009) New Revision: 14242 Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumInfo.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumsList.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/createAlbum.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/albumUnvisited.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageEditInfo.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/menu.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/misc/slideShowPooler.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/register.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelvesList.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelfUnvisited.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/tag.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userAlbums.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userImages.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedAlbums.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedImages.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/layout/template.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css Log: Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -88,6 +88,7 @@ if (Environment.isInProduction() && user.isPreDefined()) { //If true assume that login failed loginFailed(); + user = new User(); return false; } identity.addRole(Constants.ADMIN_ROLE); Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -111,6 +111,7 @@ return; } //Prepare to show in UI + fileWrapper.setComplete(false); fileWrapper.getFiles().add(image); Events.instance().raiseEvent(Constants.IMAGE_ADDED_EVENT, image); //Delete temporary file Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -26,6 +26,10 @@ */ import java.io.Serializable; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.context.AjaxContext; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; @@ -167,6 +171,7 @@ public void showNextImage(){ if(!active){ errorDetected = true; + addMainAreaToRerender(); return; } //reset index if we reached last image @@ -178,6 +183,7 @@ if(slideshowIndex == startSlideshowIndex){ stopSlideshow(); errorDetected = true; + addMainAreaToRerender(); return; } selectedImage = model.getImages().get(slideshowIndex); @@ -189,6 +195,7 @@ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_RECENTLY_DELETED_ERROR); active = false; errorDetected = true; + addMainAreaToRerender(); model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, this.selectedImage.getAlbum().getOwner(), this.selectedImage.getAlbum().getShelf(), this.selectedImage.getAlbum(), null, this.selectedImage.getAlbum().getImages()); return; } @@ -209,4 +216,15 @@ public void setErrorDetected(boolean errorDetected) { this.errorDetected = errorDetected; } + + private void addMainAreaToRerender() { + try { + FacesContext fc = FacesContext.getCurrentInstance(); + AjaxContext ac = AjaxContext.getCurrentInstance(); + UIComponent mainArea = fc.getViewRoot().findComponent(Constants.MAINAREA_ID); + ac.addComponentToAjaxRender(mainArea); + } catch (Exception e) { + System.err.print(e.getMessage()); + } + } } \ No newline at end of file Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -5,7 +5,8 @@ import java.util.List; -import org.richfaces.photoalbum.service.ISearchAction; +import org.richfaces.photoalbum.search.ISearchAction; +import org.richfaces.photoalbum.service.PhotoAlbumException; /** * Abstract class, that represent base functionality for particular search option(album, shelf, etc..) @@ -38,8 +39,9 @@ * @param searchQuery - query to search * @param searchInMyAlbums - is search in users albums will be performed * @param searchInShared - is search in shared albums will be performed + * @throws PhotoAlbumException - in case of wrong search parameters */ - public abstract void search(ISearchAction action, String searchQuery, boolean searchInMyAlbums, boolean searchInShared); + public abstract void search(ISearchAction action, String searchQuery, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException; public boolean getSelected() { return selected; Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -14,7 +14,8 @@ import org.jboss.seam.core.Events; import org.richfaces.photoalbum.manager.NavigationEnum; import org.richfaces.photoalbum.service.Constants; -import org.richfaces.photoalbum.service.ISearchAction; +import org.richfaces.photoalbum.service.PhotoAlbumException; +import org.richfaces.photoalbum.search.ISearchAction; /** * Class, that encapsulate functionality related to search process. * @author Andrey Markavtsov @@ -65,7 +66,7 @@ StringBuilder s = new StringBuilder(); for(ISearchOption option:options) { if(option.getSelected()){ - s.append(option.getName() + Constants.COMMA); + s.append(option.getName() + Constants.COMMA + " "); } } if (s.length() >= 2) { @@ -98,8 +99,12 @@ selectedKeyword = keywords.get(0).trim(); while (it.hasNext()) { ISearchOption option = it.next(); - if (option.getSelected()) { - option.search(searchAction, selectedKeyword , seachInMyAlbums, searchInShared); + try{ + if (option.getSelected()) { + option.search(searchAction, selectedKeyword , seachInMyAlbums, searchInShared); + } + }catch(PhotoAlbumException e){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, option.getName() + ":" + e.getMessage()); } } } @@ -117,8 +122,12 @@ selectedKeyword = keyword.trim(); while (it.hasNext()) { ISearchOption option = it.next(); - if (option.getSelected()) { - option.search(searchAction,selectedKeyword , seachInMyAlbums, searchInShared); + try{ + if (option.getSelected()) { + option.search(searchAction, selectedKeyword , seachInMyAlbums, searchInShared); + } + }catch(PhotoAlbumException e){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, option.getName() + ":" + e.getMessage()); } } } @@ -195,7 +204,7 @@ public boolean isResultExist(){ for(ISearchOption option : options){ - if(option.getSelected() && option.getSearchResult().size() > 0){ + if(option.getSelected() && option.getSearchResult() != null && option.getSearchResult().size() > 0){ return true; } } Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -4,7 +4,8 @@ import java.util.List; import org.richfaces.photoalbum.domain.Album; -import org.richfaces.photoalbum.service.ISearchAction; +import org.richfaces.photoalbum.search.ISearchAction; +import org.richfaces.photoalbum.service.PhotoAlbumException; /** * Class, that encapsulate functionality related to search by album entity. * @author Andrey Markavtsov @@ -36,7 +37,7 @@ * @see org.richfaces.photoalbum.search.ISearchOption#search() */ @Override - public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { + public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { List<Album> searchByAlbum = action.searchByAlbum(q, searchInMyAlbums, searchInShared); if(searchByAlbum != null){ setSearchResult(searchByAlbum); Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -7,7 +7,8 @@ import java.util.List; import org.richfaces.photoalbum.domain.Image; -import org.richfaces.photoalbum.service.ISearchAction; +import org.richfaces.photoalbum.search.ISearchAction; +import org.richfaces.photoalbum.service.PhotoAlbumException; /** * Class, that encapsulate functionality related to search by image entity. @@ -39,7 +40,7 @@ * @see org.richfaces.photoalbum.search.ISearchOption#search() */ @Override - public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { + public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { List<Image> searchByImage = action.searchByImage(q, searchInMyAlbums, searchInShared); if(searchByImage != null){ setSearchResult(searchByImage); Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -7,7 +7,8 @@ import java.util.List; import org.richfaces.photoalbum.domain.Shelf; -import org.richfaces.photoalbum.service.ISearchAction; +import org.richfaces.photoalbum.search.ISearchAction; +import org.richfaces.photoalbum.service.PhotoAlbumException; /** * Class, that encapsulate functionality related to search by shelf entity. @@ -49,7 +50,7 @@ */ @Override public void search(ISearchAction action, String searchQuery, - boolean searchInMyAlbums, boolean searchInShared) { + boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { List<Shelf> list = action.searchByShelves(searchQuery, searchInMyAlbums, searchInShared); if(list != null){ setSearchResult(list); Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -7,7 +7,8 @@ import java.util.List; import org.richfaces.photoalbum.domain.MetaTag; -import org.richfaces.photoalbum.service.ISearchAction; +import org.richfaces.photoalbum.search.ISearchAction; +import org.richfaces.photoalbum.service.PhotoAlbumException; /** * Class, that encapsulate functionality related to search by metatag entity. @@ -49,7 +50,7 @@ */ @Override public void search(ISearchAction action, String searchQuery, - boolean searchInMyAlbums, boolean searchInShared) { + boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { List<MetaTag> searchByTags = action.searchByTags(searchQuery, searchInMyAlbums, searchInShared); if(searchByTags != null){ setSearchResult(searchByTags); Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java 2009-05-19 17:27:59 UTC (rev 14242) @@ -7,7 +7,8 @@ import java.util.List; import org.richfaces.photoalbum.domain.User; -import org.richfaces.photoalbum.service.ISearchAction; +import org.richfaces.photoalbum.search.ISearchAction; +import org.richfaces.photoalbum.service.PhotoAlbumException; /** * Class, that encapsulate functionality related to search by user entity. @@ -48,7 +49,7 @@ * @see org.richfaces.photoalbum.search.ISearchOption#search(org.richfaces.photoalbum.service.ISearchAction) */ @Override - public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { + public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException { List<User> searchByUsers = action.searchByUsers(q, searchInMyAlbums, searchInShared); if(searchByUsers != null){ setSearchResult(searchByUsers); Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-05-19 17:27:59 UTC (rev 14242) @@ -261,17 +261,16 @@ keywords=Keywords: user_profile_=User profile message_authorHeader=Author -all_new_images=All new images +all_new_images_shelf=All new images(#{model.images.size()}) in shelf #{model.selectedShelf.name} +all_new_images_album=All new images(#{model.images.size()}) in album #{model.selectedAlbum.name} in_album=in album public_shelves=Pre-defined Shelves -all_images=All images -related_to_tag=related to tag +all_images=All images(#{model.images.size()}) related to tag #{model.selectedTag.tag} my_all_albums=My all albums my_all_photos=My all images ok=Ok -all_shared_albums=All shared albums -of_user=of user -all_shared_images=All shared images +all_shared_albums=All shared albums(#{model.selectedUser.sharedAlbums.size()}) of user #{model.selectedUser.login} +all_shared_images=All shared images(#{model.selectedUser.sharedImages.size()}) of user #{model.selectedUser.login} my_album_shelves=My album shelves cancel=Cancel save=Save Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumInfo.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumsList.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/createAlbum.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/albumUnvisited.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageEditInfo.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/menu.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/misc/slideShowPooler.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/register.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-05-19 17:27:59 UTC (rev 14242) @@ -20,7 +20,7 @@ </h:panelGroup> </h:panelGrid> <h:panelGroup layout="block" styleClass="photo_name"> - <strong>#{searchedUser.firstName} #{searchedUser.secondName}</strong> + <h:outputText class="bold" value="#{searchedUser.firstName} #{searchedUser.secondName}"/> </h:panelGroup> <h:panelGroup layout="block" styleClass="photo_data"> <h:outputText value="#{searchedUser.birthDate}" > @@ -28,7 +28,8 @@ </h:outputText> </h:panelGroup> <h:panelGroup layout="block" styleClass="photo_data"> - <a4j:commandLink reRender="treePanel, mainArea" actionListener="#{controller.showSharedAlbums(searchedUser)}" ><h:outputText value="#{searchedUser.sharedAlbums.size} #{messages['albums_small']} "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(searchedUser)}"><h:outputText value="#{searchedUser.sharedImages.size} #{messages['photos']}"/></a4j:commandLink> + <a4j:commandLink reRender="treePanel, mainArea" actionListener="#{controller.showSharedAlbums(searchedUser)}" > + <h:outputText value="#{searchedUser.sharedAlbums.size} #{messages['albums_small']} "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(searchedUser)}"><h:outputText value=" #{searchedUser.sharedImages.size} #{messages['photos']}"/></a4j:commandLink> </h:panelGroup> </h:panelGroup> </a4j:repeat> Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelvesList.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelfUnvisited.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/tag.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userAlbums.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userImages.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedAlbums.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedImages.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/layout/template.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css 2009-05-18 15:37:29 UTC (rev 14241) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css 2009-05-19 17:27:59 UTC (rev 14242) @@ -294,7 +294,9 @@ .errors textarea { border: 1px solid red; } - +.bold { + font-weight:bold; +} .required { color: red; padding-left: 2px; @@ -565,7 +567,12 @@ border-collapse : collapse; margin-bottom : 15px; } - +.user-prefs-button{ + text-align:center; + margin-top : 10px; + margin-left:auto; + margin-right:auto; +} .shelf-header-table h1{ margin-bottom : 4px; } @@ -888,8 +895,14 @@ .search-criteria { color: #666666; + padding-bottom:7px; } +.search-keyword { + color: #666666; + padding-bottom:25px; +} + .shelf-edit { margin : 10px 0px 30px 30px; width : 504px;

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14241 - in branches/community/3.3.X: cdk and 215 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-05-18 11:37:29 -0400 (Mon, 18 May 2009) New Revision: 14241 Modified: branches/community/3.3.X/cdk/generator/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml branches/community/3.3.X/cdk/pom.xml branches/community/3.3.X/docs/cdkguide/en/pom.xml branches/community/3.3.X/docs/cdkguide/pom.xml branches/community/3.3.X/docs/common-resources/en/pom.xml branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/docs/common-resources/pom.xml branches/community/3.3.X/docs/faq/en/pom.xml branches/community/3.3.X/docs/faq/pom.xml branches/community/3.3.X/docs/highlight/pom.xml branches/community/3.3.X/docs/migrationguide/en/pom.xml branches/community/3.3.X/docs/migrationguide/pom.xml branches/community/3.3.X/docs/photo_album_app_guide/en/pom.xml branches/community/3.3.X/docs/photo_album_app_guide/pom.xml branches/community/3.3.X/docs/pom.xml branches/community/3.3.X/docs/userguide/en/pom.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml branches/community/3.3.X/docs/userguide/pom.xml branches/community/3.3.X/examples/photoalbum/assembly/pom.xml branches/community/3.3.X/examples/photoalbum/pom.xml branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml branches/community/3.3.X/examples/photoalbum/source/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/pom.xml branches/community/3.3.X/examples/photoalbum/tests/pom.xml branches/community/3.3.X/extensions/gwt/pom.xml branches/community/3.3.X/extensions/pom.xml branches/community/3.3.X/extensions/seam/pom.xml branches/community/3.3.X/extensions/trinidad/pom.xml branches/community/3.3.X/framework/api/pom.xml branches/community/3.3.X/framework/impl/pom.xml branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java branches/community/3.3.X/framework/jsf-test/pom.xml branches/community/3.3.X/framework/pom.xml branches/community/3.3.X/framework/test/pom.xml branches/community/3.3.X/pom.xml branches/community/3.3.X/samples/beanValidatorSample/pom.xml branches/community/3.3.X/samples/calendar-sample/pom.xml branches/community/3.3.X/samples/colorPickerDemo/pom.xml branches/community/3.3.X/samples/columnsDemo/pom.xml branches/community/3.3.X/samples/combobox-sample/pom.xml branches/community/3.3.X/samples/contextMenuDemo/pom.xml branches/community/3.3.X/samples/createProject.sh branches/community/3.3.X/samples/darkX/pom.xml branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml branches/community/3.3.X/samples/dataTableDemo/pom.xml branches/community/3.3.X/samples/datascroller-sample/pom.xml branches/community/3.3.X/samples/dragDropDemo/pom.xml branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml branches/community/3.3.X/samples/editor-sample/pom.xml branches/community/3.3.X/samples/editorSeam-sample/pom.xml branches/community/3.3.X/samples/effect-sample/pom.xml branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml branches/community/3.3.X/samples/fileUploadDemo/pom.xml branches/community/3.3.X/samples/functions-demo/pom.xml branches/community/3.3.X/samples/glassX/pom.xml branches/community/3.3.X/samples/gmap-sample/pom.xml branches/community/3.3.X/samples/hotKey-sample/pom.xml branches/community/3.3.X/samples/inplaceInput-sample/pom.xml branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml branches/community/3.3.X/samples/jQuery-sample/pom.xml branches/community/3.3.X/samples/jira-data/pom.xml branches/community/3.3.X/samples/laguna/pom.xml branches/community/3.3.X/samples/layout-sample/pom.xml branches/community/3.3.X/samples/listShuttleDemo/pom.xml branches/community/3.3.X/samples/local-value-demo/pom.xml branches/community/3.3.X/samples/modalpanel-sample/pom.xml branches/community/3.3.X/samples/orderingListDemo/pom.xml branches/community/3.3.X/samples/panel-sample/pom.xml branches/community/3.3.X/samples/panelbar-sample/pom.xml branches/community/3.3.X/samples/panelmenu-sample/pom.xml branches/community/3.3.X/samples/pickList-sample/pom.xml branches/community/3.3.X/samples/pom.xml branches/community/3.3.X/samples/progressBarDemo/pom.xml branches/community/3.3.X/samples/queue-sample/pom.xml branches/community/3.3.X/samples/rich-message-demo/pom.xml branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml branches/community/3.3.X/samples/seamEAR/ear/pom.xml branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml branches/community/3.3.X/samples/seamEAR/pom.xml branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml branches/community/3.3.X/samples/seamEAR/projects/pom.xml branches/community/3.3.X/samples/seamEAR/wars/pom.xml branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml branches/community/3.3.X/samples/seamIntegration/pom.xml branches/community/3.3.X/samples/separator-sample/pom.xml branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml branches/community/3.3.X/samples/skins/pom.xml branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml branches/community/3.3.X/samples/state-sample/pom.xml branches/community/3.3.X/samples/stdcomponents-sample/pom.xml branches/community/3.3.X/samples/suggestionbox-sample/pom.xml branches/community/3.3.X/samples/tabPanelDemo/pom.xml branches/community/3.3.X/samples/themes/pom.xml branches/community/3.3.X/samples/togglePanel-sample/pom.xml branches/community/3.3.X/samples/tomahawkCompability/pom.xml branches/community/3.3.X/samples/toolBarDemo/pom.xml branches/community/3.3.X/samples/tooltip-sample/pom.xml branches/community/3.3.X/samples/tree-demo/pom.xml branches/community/3.3.X/samples/treeModelDemo/pom.xml branches/community/3.3.X/samples/violetRays/pom.xml branches/community/3.3.X/samples/virtualEarth-sample/pom.xml branches/community/3.3.X/sandbox/api/pom.xml branches/community/3.3.X/sandbox/cdk/pom.xml branches/community/3.3.X/sandbox/impl/pom.xml branches/community/3.3.X/sandbox/pom.xml branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml branches/community/3.3.X/sandbox/samples/pom.xml branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml branches/community/3.3.X/sandbox/ui/create.bat branches/community/3.3.X/sandbox/ui/create.sh branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml branches/community/3.3.X/sandbox/ui/editorOld/pom.xml branches/community/3.3.X/sandbox/ui/panel2/pom.xml branches/community/3.3.X/sandbox/ui/pom.xml branches/community/3.3.X/sandbox/ui/rex-button/pom.xml branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml branches/community/3.3.X/sandbox/ui/treeTable/pom.xml branches/community/3.3.X/test-applications/ajaxTest/pom.xml branches/community/3.3.X/test-applications/automator/pom.xml branches/community/3.3.X/test-applications/facelets/pom.xml branches/community/3.3.X/test-applications/jsp/pom.xml branches/community/3.3.X/test-applications/pom.xml branches/community/3.3.X/test-applications/regressionArea/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml branches/community/3.3.X/test-applications/richfaces-docs/pom.xml branches/community/3.3.X/test-applications/richfaces-docs/web/pom.xml branches/community/3.3.X/test-applications/seamApp/pom.xml branches/community/3.3.X/test-applications/seleniumTest/pom.xml branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml branches/community/3.3.X/ui/assembly/pom.xml branches/community/3.3.X/ui/beanValidator/pom.xml branches/community/3.3.X/ui/calendar/pom.xml branches/community/3.3.X/ui/colorPicker/pom.xml branches/community/3.3.X/ui/columns/pom.xml branches/community/3.3.X/ui/combobox/pom.xml branches/community/3.3.X/ui/componentControl/pom.xml branches/community/3.3.X/ui/contextMenu/pom.xml branches/community/3.3.X/ui/core/pom.xml branches/community/3.3.X/ui/create.bat branches/community/3.3.X/ui/dataFilterSlider/pom.xml branches/community/3.3.X/ui/dataTable/pom.xml branches/community/3.3.X/ui/datascroller/pom.xml branches/community/3.3.X/ui/drag-drop/pom.xml branches/community/3.3.X/ui/dropdown-menu/pom.xml branches/community/3.3.X/ui/editor/pom.xml branches/community/3.3.X/ui/effect/pom.xml branches/community/3.3.X/ui/extendedDataTable/pom.xml branches/community/3.3.X/ui/fileUpload/pom.xml branches/community/3.3.X/ui/functions/pom.xml branches/community/3.3.X/ui/gmap/pom.xml branches/community/3.3.X/ui/hotKey/pom.xml branches/community/3.3.X/ui/inplaceInput/pom.xml branches/community/3.3.X/ui/inplaceSelect/pom.xml branches/community/3.3.X/ui/inputnumber-slider/pom.xml branches/community/3.3.X/ui/inputnumber-spinner/pom.xml branches/community/3.3.X/ui/insert/pom.xml branches/community/3.3.X/ui/jQuery/pom.xml branches/community/3.3.X/ui/layout/pom.xml branches/community/3.3.X/ui/listShuttle/pom.xml branches/community/3.3.X/ui/menu-components/pom.xml branches/community/3.3.X/ui/message/pom.xml branches/community/3.3.X/ui/modal-panel/pom.xml branches/community/3.3.X/ui/orderingList/pom.xml branches/community/3.3.X/ui/paint2D/pom.xml branches/community/3.3.X/ui/panel/pom.xml branches/community/3.3.X/ui/panelbar/pom.xml branches/community/3.3.X/ui/panelmenu/pom.xml branches/community/3.3.X/ui/pickList/pom.xml branches/community/3.3.X/ui/pom.xml branches/community/3.3.X/ui/progressBAR/pom.xml branches/community/3.3.X/ui/scrollableDataTable/pom.xml branches/community/3.3.X/ui/separator/pom.xml branches/community/3.3.X/ui/simpleTogglePanel/pom.xml branches/community/3.3.X/ui/spacer/pom.xml branches/community/3.3.X/ui/state/pom.xml branches/community/3.3.X/ui/suggestionbox/pom.xml branches/community/3.3.X/ui/tabPanel/pom.xml branches/community/3.3.X/ui/togglePanel/pom.xml branches/community/3.3.X/ui/toolBar/pom.xml branches/community/3.3.X/ui/tooltip/pom.xml branches/community/3.3.X/ui/tree/pom.xml branches/community/3.3.X/ui/treeModel/pom.xml branches/community/3.3.X/ui/treeTable/pom.xml branches/community/3.3.X/ui/virtualEarth/pom.xml Log: Version changed to 3.3.2-SNAPSHOT Modified: branches/community/3.3.X/cdk/generator/pom.xml =================================================================== --- branches/community/3.3.X/cdk/generator/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/generator/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Java Server Faces component generator</name> <build> <plugins> Modified: branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsf-component</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Archetype - maven-archetype-jsf-component</name> </project> \ No newline at end of file Modified: branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -11,7 +11,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <configuration> <library> <prefix>${groupId}</prefix> @@ -41,7 +41,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsfwebapp</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Modified: branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -30,7 +30,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-plug-n-skin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Archetype - maven-archetype-plug-n-skin</name> Modified: branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -34,7 +34,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>junit</groupId> Modified: branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-seam-app</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Archetype - maven-archetype-seam-app</name> </project> \ No newline at end of file Modified: branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>${artifactId}</projectName> - <richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion> + <richfacesVersion>3.3.2-SNAPSHOT</richfacesVersion> <seamVersion>2.0.1.GA</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.3.GA/jboss-4.2.3.GA/server/default/</jbossDeployDir> Modified: branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-theme</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>maven-archetype-theme</name> <build> Modified: branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -41,12 +41,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency>  Modified: branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Maven plugin for JSF components code generation</name> <dependencies> @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> Modified: branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-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.1-SNAPSHOT</version> + <version>3.3.2-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.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/cdk/pom.xml =================================================================== --- branches/community/3.3.X/cdk/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/cdk/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: branches/community/3.3.X/docs/cdkguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/cdkguide/en/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.cdkguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces CDK Developer Guide (${translation})</name> Modified: branches/community/3.3.X/docs/cdkguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/cdkguide/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> <packaging>pom</packaging> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>cdkguide</name> <description>Richfaces CDK Developer Guide</description> <pluginRepositories> Modified: branches/community/3.3.X/docs/common-resources/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/common-resources/en/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>common-resources</artifactId> <groupId>org.richfaces.docs</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.common-resources</groupId> <artifactId>en</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>Documentation common resources (en)</name> <description> @@ -17,7 +17,7 @@ <dependency> <groupId>org.richfaces.docs</groupId> <artifactId>highlight</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <artifactId>richfacesguide-archetype</artifactId> <packaging>maven-archetype</packaging> <name>richfacesguide-archetype</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <extensions> <extension> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.richfacesguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Guide Template</name> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> <packaging>pom</packaging> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>richfacesguide</name> <description>Richfaces Guide Template</description> <pluginRepositories> Modified: branches/community/3.3.X/docs/common-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/common-resources/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>common-resources</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Documentation common resources</name> <description>Common resources</description> Modified: branches/community/3.3.X/docs/faq/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/en/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/faq/en/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.faq</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> Modified: branches/community/3.3.X/docs/faq/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/faq/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> <packaging>pom</packaging> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>FAQ</name> <description>Frequently asked questions</description>  Modified: branches/community/3.3.X/docs/userguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/userguide/en/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -327,7 +327,7 @@ <para>Now you have everything to create the project using the "maven-archetype-jsfwebapp" archetype. Create a folder that will house your project and run the this command in it:</para> <programlisting role="XML" ><![CDATA[... -mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.1-SNAPSHOT -DgroupId=org.docs.richfaces -DartifactId=jsf-app +mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.2-SNAPSHOT -DgroupId=org.docs.richfaces -DartifactId=jsf-app ...]]></programlisting> @@ -453,17 +453,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> ...]]></programlisting> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3238,7 +3238,7 @@ <listitem> <para> <code>archetypeVersion</code> indicates the RichFaces version. For example, - <code>"3.3.1-SNAPSHOT"</code> + <code>"3.3.2-SNAPSHOT"</code> </para> </listitem> <listitem> @@ -3482,7 +3482,7 @@ mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-plug-n-skin --DarchetypeVersion=3.3.1-SNAPSHOT +-DarchetypeVersion=3.3.2-SNAPSHOT -DartifactId=P-n-S -DgroupId=GROUPID -Dversion=1.0.-SNAPSHOT Modified: branches/community/3.3.X/docs/userguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/docs/userguide/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> <packaging>pom</packaging> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>User guide</name> <description>RichFaces user guide</description> <pluginRepositories> Modified: branches/community/3.3.X/examples/photoalbum/assembly/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/assembly/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/examples/photoalbum/assembly/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/examples/photoalbum/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> <packaging>pom</packaging> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Photoalbum Demo Application Root</name> <modules> Modified: branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/source/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/examples/photoalbum/source/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -8,7 +8,7 @@ <artifactId>photoalbum</artifactId> <packaging>pom</packaging> <name>${appName}</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <distributionManagement> <downloadUrl> Modified: branches/community/3.3.X/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/tests/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/extensions/gwt/pom.xml =================================================================== --- branches/community/3.3.X/extensions/gwt/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/extensions/gwt/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>extensions</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -99,7 +99,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: branches/community/3.3.X/extensions/pom.xml =================================================================== --- branches/community/3.3.X/extensions/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/extensions/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>extensions</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Richfaces extensions for a different environments</name> <packaging>pom</packaging> <modules> Modified: branches/community/3.3.X/extensions/seam/pom.xml =================================================================== --- branches/community/3.3.X/extensions/seam/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/extensions/seam/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>jboss</groupId> Modified: branches/community/3.3.X/extensions/trinidad/pom.xml =================================================================== --- branches/community/3.3.X/extensions/trinidad/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/extensions/trinidad/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.myfaces.trinidad</groupId> Modified: branches/community/3.3.X/framework/api/pom.xml =================================================================== --- branches/community/3.3.X/framework/api/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/framework/api/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,13 +2,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <dependencies> <dependency> <groupId>commons-collections</groupId> Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/framework/impl/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,13 +3,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <resources> <resource> @@ -161,7 +161,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-05-18 15:37:29 UTC (rev 14241) @@ -38,7 +38,7 @@ * Revision version, must be auto modified by CVS */ - public static final String REVISION = "1-SNAPSHOT" ; + public static final String REVISION = "2-SNAPSHOT" ; public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$"; public static final Version _version = new Version(); Modified: branches/community/3.3.X/framework/jsf-test/pom.xml =================================================================== --- branches/community/3.3.X/framework/jsf-test/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/framework/jsf-test/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,13 +4,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <dependencies> <dependency> <groupId>junit</groupId> Modified: branches/community/3.3.X/framework/pom.xml =================================================================== --- branches/community/3.3.X/framework/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/framework/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> <build> Modified: branches/community/3.3.X/framework/test/pom.xml =================================================================== --- branches/community/3.3.X/framework/test/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/framework/test/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> <dependencies> @@ -42,7 +42,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/pom.xml =================================================================== --- branches/community/3.3.X/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <artifactId>root</artifactId> <packaging>pom</packaging> <name>Jboss RichFaces project</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces</url> <properties> <snapshotRepository> Modified: branches/community/3.3.X/samples/beanValidatorSample/pom.xml =================================================================== --- branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,14 +3,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>beanValidatorSample</artifactId> <packaging>war</packaging> <name>beanValidatorSample Maven Webapp</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <finalName>richfaces-validator</finalName> <plugins> @@ -52,7 +52,7 @@  <dependency> <groupId>org.hibernate</groupId> @@ -75,7 +75,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.uwyn</groupId> Modified: branches/community/3.3.X/samples/calendar-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/calendar-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/calendar-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/colorPickerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -35,7 +35,7 @@ <groupId>org.richfaces.framework </groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples @@ -46,17 +46,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>colorPicker</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: branches/community/3.3.X/samples/columnsDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/columnsDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/columnsDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/combobox-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/combobox-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/combobox-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/contextMenuDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/contextMenuDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/contextMenuDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/createProject.sh =================================================================== --- branches/community/3.3.X/samples/createProject.sh 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/createProject.sh 2009-05-18 15:37:29 UTC (rev 14241) @@ -1,3 +1,3 @@ #!/bin/sh mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \ - -DarchetypeVersion=3.3.1-SNAPSHOT -Dversion=3.3.1-SNAPSHOT -DgroupId=org.richfaces.samples -DartifactId=$1 + -DarchetypeVersion=3.3.2-SNAPSHOT -Dversion=3.3.2-SNAPSHOT -DgroupId=org.richfaces.samples -DartifactId=$1 Modified: branches/community/3.3.X/samples/darkX/pom.xml =================================================================== --- branches/community/3.3.X/samples/darkX/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/darkX/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -36,7 +36,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>junit</groupId> Modified: branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/dataTableDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dataTableDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/dataTableDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/datascroller-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/datascroller-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/datascroller-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/dragDropDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dragDropDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/dragDropDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/editor-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/editor-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/editor-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/samples/editorSeam-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/editorSeam-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/editorSeam-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/samples/effect-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/effect-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/effect-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/samples/fileUploadDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/fileUploadDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/fileUploadDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/functions-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/functions-demo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/functions-demo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/glassX/pom.xml =================================================================== --- branches/community/3.3.X/samples/glassX/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/glassX/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> <name>glassX</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -37,7 +37,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>junit</groupId> Modified: branches/community/3.3.X/samples/gmap-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/gmap-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/gmap-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/hotKey-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/hotKey-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/hotKey-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/samples/inplaceInput-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/inplaceInput-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/inplaceInput-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/jQuery-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/jQuery-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/jQuery-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/jira-data/pom.xml =================================================================== --- branches/community/3.3.X/samples/jira-data/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/jira-data/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/laguna/pom.xml =================================================================== --- branches/community/3.3.X/samples/laguna/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/laguna/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <configuration> <name>org.richfaces.laguna</name> </configuration> Modified: branches/community/3.3.X/samples/layout-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/layout-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/layout-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,14 +4,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>layout-sample</artifactId> <packaging>war</packaging> <name>layout Maven Webapp</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <finalName>layout-sample</finalName> <plugins> @@ -34,22 +34,22 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.richfaces.ui</groupId> Modified: branches/community/3.3.X/samples/listShuttleDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/listShuttleDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/listShuttleDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/local-value-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/local-value-demo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/local-value-demo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/modalpanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/modalpanel-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/modalpanel-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/orderingListDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/orderingListDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/orderingListDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/panel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panel-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/panel-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/panelbar-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panelbar-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/panelbar-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/panelmenu-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panelmenu-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/panelmenu-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/pickList-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/pickList-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/pickList-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/samples/progressBarDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/progressBarDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/progressBarDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/queue-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/queue-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/queue-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>queue-sample</artifactId> <packaging>war</packaging> <name>queue-sample Maven Webapp</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <finalName>queue-sample</finalName> <plugins> Modified: branches/community/3.3.X/samples/rich-message-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/rich-message-demo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/rich-message-demo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -209,22 +209,22 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>laguna</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>darkX</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -314,12 +314,12 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.persistence</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>scrollableDataTableDemo</artifactId> Modified: branches/community/3.3.X/samples/seamEAR/ear/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/ear/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/ear/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <dependencies> <dependency> Modified: branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <dependencies> <dependency> Modified: branches/community/3.3.X/samples/seamEAR/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <dependencies> <dependency> Modified: branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -7,6 +7,6 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>projects</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> </project> Modified: branches/community/3.3.X/samples/seamEAR/projects/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/projects/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/projects/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modules> <module>logging</module> Modified: branches/community/3.3.X/samples/seamEAR/wars/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/wars/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/wars/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modules> <module>seamWebapp</module> Modified: branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>wars</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <build> <finalName>seamWebapp</finalName> @@ -22,17 +22,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Modified: branches/community/3.3.X/samples/seamIntegration/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamIntegration/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/seamIntegration/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/separator-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/separator-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/separator-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/skins/pom.xml =================================================================== --- branches/community/3.3.X/samples/skins/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/skins/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@  <dependency> Modified: branches/community/3.3.X/samples/state-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/state-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/state-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -16,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>state</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/samples/stdcomponents-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/stdcomponents-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/stdcomponents-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/suggestionbox-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/suggestionbox-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/suggestionbox-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tabPanelDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/tabPanelDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/tabPanelDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/themes/pom.xml =================================================================== --- branches/community/3.3.X/samples/themes/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/themes/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>themes</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -38,7 +38,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/samples/togglePanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/togglePanel-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/togglePanel-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tomahawkCompability/pom.xml =================================================================== --- branches/community/3.3.X/samples/tomahawkCompability/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/tomahawkCompability/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/toolBarDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/toolBarDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/toolBarDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tooltip-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/tooltip-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/tooltip-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tree-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/tree-demo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/tree-demo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/treeModelDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/treeModelDemo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/treeModelDemo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/violetRays/pom.xml =================================================================== --- branches/community/3.3.X/samples/violetRays/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/violetRays/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>violetRays</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -38,7 +38,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/samples/virtualEarth-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/virtualEarth-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/samples/virtualEarth-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/sandbox/api/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/api/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/api/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,13 +2,13 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> <name>Richfaces Sandbox API</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> @@ -25,12 +25,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/sandbox/cdk/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/cdk/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/cdk/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>cdk</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: branches/community/3.3.X/sandbox/impl/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/impl/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/impl/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,28 +2,28 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> <name>Richfaces Sandbox Implementation</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/sandbox/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk.sandbox</groupId> <artifactId>maven-rd-plugin-sample</artifactId> <packaging>war</packaging> <name>maven-rd-plugin-sample Maven Webapp</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <pluginRepositories> <pluginRepository> @@ -33,7 +33,7 @@ <plugin> <artifactId>maven-resource-dependency-plugin</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <configuration> <scriptFilePath>scripts/custom-dependencies.js</scriptFilePath> <styleFilePath>css/custom-dependencies.xcss</styleFilePath> @@ -59,7 +59,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>samples</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -178,7 +178,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -193,28 +193,28 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-resizable</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-button</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-messageBox</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> Modified: branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/sandbox/ui/create.bat =================================================================== --- branches/community/3.3.X/sandbox/ui/create.bat 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/create.bat 2009-05-18 15:37:29 UTC (rev 14241) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.2-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/create.sh =================================================================== --- branches/community/3.3.X/sandbox/ui/create.sh 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/create.sh 2009-05-18 15:37:29 UTC (rev 14241) @@ -1,2 +1,2 @@ #!/bin/sh -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.2-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -39,12 +39,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/community/3.3.X/sandbox/ui/editorOld/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/editorOld/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/editorOld/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/panel2/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/panel2/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/panel2/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,7 +3,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> Modified: branches/community/3.3.X/sandbox/ui/rex-button/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-button/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/rex-button/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>sortableHeader</artifactId> <name>sortableHeader</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -52,17 +52,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/treeTable/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/treeTable/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/sandbox/ui/treeTable/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/test-applications/ajaxTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/ajaxTest/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/ajaxTest/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -66,7 +66,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.el</groupId> Modified: branches/community/3.3.X/test-applications/automator/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/automator/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/automator/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/test-applications/facelets/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/facelets/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/facelets/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/test-applications/jsp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/jsp/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/jsp/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/test-applications/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <relativePath>../samples</relativePath> </parent> @@ -50,11 +50,11 @@ <groupId>org.richfaces</groupId> <artifactId>test-applications</artifactId> <packaging>pom</packaging> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>RichFaces Test Applications</name> <properties> - <rfVersion>3.3.1-SNAPSHOT</rfVersion> + <rfVersion>3.3.2-SNAPSHOT</rfVersion> </properties> <modules> Modified: branches/community/3.3.X/test-applications/regressionArea/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/regressionArea/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,12 +4,12 @@  <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> <packaging>pom</packaging> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Regresion Area:Seam Application</name> <repositories> <repository> @@ -60,7 +60,7 @@ <properties> <contextroot>regressionArea</contextroot> <earname>regressionArea-ear</earname> - <richversion>3.3.1-SNAPSHOT</richversion> + <richversion>3.3.2-SNAPSHOT</richversion> <seamversion>2.1.1.GA</seamversion> <jsfversion>1.2_11</jsfversion> <jbosshome>C:/tmp/jboss-4.2.3.GA</jbosshome> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -6,9 +6,9 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ear</artifactId> <name>Regression Area Ear Module</name> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ejb</artifactId> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>regressionArea</artifactId> <groupId>org.richfaces.test-applications</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.test-applications.regressionArea</groupId> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-web</artifactId> Modified: branches/community/3.3.X/test-applications/richfaces-docs/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -8,7 +8,7 @@ <name>richfaces-docs</name> <properties> <projectName>richfaces-docs</projectName> - <richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion> + <richfacesVersion>3.3.2-SNAPSHOT</richfacesVersion> <seamVersion>2.0.1.GA</seamVersion> <droolsVersion>4.0.0</droolsVersion> Modified: branches/community/3.3.X/test-applications/richfaces-docs/web/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/richfaces-docs/web/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/richfaces-docs/web/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -47,7 +47,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <scope>provided</scope> </dependency> Modified: branches/community/3.3.X/test-applications/seamApp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/seamApp/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>seamApp</projectName> - <rfVersion>3.3.1-SNAPSHOT</rfVersion> + <rfVersion>3.3.2-SNAPSHOT</rfVersion> <seamVersion>2.1.0.SP1</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/</jbossDeployDir> Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,14 +5,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> <packaging>pom</packaging> <name>SeleniumTest</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <url>http://maven.apache.org</url> <properties> <http.port>8085</http.port> @@ -227,7 +227,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,14 +5,14 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>richfaces</artifactId> <packaging>war</packaging> <name>seleniumTest Maven Webapp</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <finalName>richfaces</finalName> </build> Modified: branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -5,13 +5,13 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>samples</artifactId> <name>Samples</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <finalName>seleniumTest</finalName> <plugins> Modified: branches/community/3.3.X/ui/assembly/pom.xml =================================================================== --- branches/community/3.3.X/ui/assembly/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/assembly/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -15,7 +15,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <configuration> <library> <prefix>org.richfaces</prefix> Modified: branches/community/3.3.X/ui/beanValidator/pom.xml =================================================================== --- branches/community/3.3.X/ui/beanValidator/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/beanValidator/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -3,19 +3,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>beanValidator</artifactId> <name>beanValidator</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,12 +45,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.hibernate</groupId> Modified: branches/community/3.3.X/ui/calendar/pom.xml =================================================================== --- branches/community/3.3.X/ui/calendar/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/calendar/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,13 +45,13 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/colorPicker/pom.xml =================================================================== --- branches/community/3.3.X/ui/colorPicker/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/colorPicker/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -12,7 +12,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/columns/pom.xml =================================================================== --- branches/community/3.3.X/ui/columns/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/columns/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: branches/community/3.3.X/ui/combobox/pom.xml =================================================================== --- branches/community/3.3.X/ui/combobox/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/combobox/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> <name>combobox</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/ui/componentControl/pom.xml =================================================================== --- branches/community/3.3.X/ui/componentControl/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/componentControl/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -50,7 +50,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/contextMenu/pom.xml =================================================================== --- branches/community/3.3.X/ui/contextMenu/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/contextMenu/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> <name>contextMenu</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/core/pom.xml =================================================================== --- branches/community/3.3.X/ui/core/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/core/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/create.bat =================================================================== --- branches/community/3.3.X/ui/create.bat 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/create.bat 2009-05-18 15:37:29 UTC (rev 14241) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.2-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file Modified: branches/community/3.3.X/ui/dataFilterSlider/pom.xml =================================================================== --- branches/community/3.3.X/ui/dataFilterSlider/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/dataFilterSlider/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -14,7 +14,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/dataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/dataTable/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/dataTable/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> --> </dependencies> Modified: branches/community/3.3.X/ui/datascroller/pom.xml =================================================================== --- branches/community/3.3.X/ui/datascroller/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/datascroller/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/drag-drop/pom.xml =================================================================== --- branches/community/3.3.X/ui/drag-drop/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/drag-drop/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> --> </dependencies> Modified: branches/community/3.3.X/ui/dropdown-menu/pom.xml =================================================================== --- branches/community/3.3.X/ui/dropdown-menu/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/dropdown-menu/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,12 +44,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/editor/pom.xml =================================================================== --- branches/community/3.3.X/ui/editor/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/editor/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -62,7 +62,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>antlr</groupId> Modified: branches/community/3.3.X/ui/effect/pom.xml =================================================================== --- branches/community/3.3.X/ui/effect/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/effect/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/extendedDataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/extendedDataTable/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/extendedDataTable/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -64,45 +64,45 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>jQuery</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>scrollableDataTable</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/fileUpload/pom.xml =================================================================== --- branches/community/3.3.X/ui/fileUpload/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/fileUpload/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>fileUpload</artifactId> <name>fileUpload</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/functions/pom.xml =================================================================== --- branches/community/3.3.X/ui/functions/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/functions/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/gmap/pom.xml =================================================================== --- branches/community/3.3.X/ui/gmap/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/gmap/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/hotKey/pom.xml =================================================================== --- branches/community/3.3.X/ui/hotKey/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/hotKey/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -50,7 +50,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/inplaceInput/pom.xml =================================================================== --- branches/community/3.3.X/ui/inplaceInput/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/inplaceInput/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> <name>inplaceInput</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,17 +51,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/inplaceSelect/pom.xml =================================================================== --- branches/community/3.3.X/ui/inplaceSelect/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/inplaceSelect/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceSelect</artifactId> <name>inplaceSelect</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,22 +51,22 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/ui/inputnumber-slider/pom.xml =================================================================== --- branches/community/3.3.X/ui/inputnumber-slider/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/inputnumber-slider/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/inputnumber-spinner/pom.xml =================================================================== --- branches/community/3.3.X/ui/inputnumber-spinner/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/inputnumber-spinner/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/ui/insert/pom.xml =================================================================== --- branches/community/3.3.X/ui/insert/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/insert/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/jQuery/pom.xml =================================================================== --- branches/community/3.3.X/ui/jQuery/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/jQuery/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/layout/pom.xml =================================================================== --- branches/community/3.3.X/ui/layout/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/layout/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -4,18 +4,18 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>layout</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>layout</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -48,7 +48,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: branches/community/3.3.X/ui/listShuttle/pom.xml =================================================================== --- branches/community/3.3.X/ui/listShuttle/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/listShuttle/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: branches/community/3.3.X/ui/menu-components/pom.xml =================================================================== --- branches/community/3.3.X/ui/menu-components/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/menu-components/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/message/pom.xml =================================================================== --- branches/community/3.3.X/ui/message/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/message/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <name>Message</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/modal-panel/pom.xml =================================================================== --- branches/community/3.3.X/ui/modal-panel/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/modal-panel/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/orderingList/pom.xml =================================================================== --- branches/community/3.3.X/ui/orderingList/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/orderingList/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/paint2D/pom.xml =================================================================== --- branches/community/3.3.X/ui/paint2D/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/paint2D/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/panel/pom.xml =================================================================== --- branches/community/3.3.X/ui/panel/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/panel/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/panelbar/pom.xml =================================================================== --- branches/community/3.3.X/ui/panelbar/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/panelbar/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/panelmenu/pom.xml =================================================================== --- branches/community/3.3.X/ui/panelmenu/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/panelmenu/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/pickList/pom.xml =================================================================== --- branches/community/3.3.X/ui/pickList/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/pickList/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>pickList</artifactId> <name>pickList</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -53,26 +53,26 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>listShuttle</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>orderingList</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/ui/pom.xml =================================================================== --- branches/community/3.3.X/ui/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -138,12 +138,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> Modified: branches/community/3.3.X/ui/progressBAR/pom.xml =================================================================== --- branches/community/3.3.X/ui/progressBAR/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/progressBAR/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> <name>progressBar</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,12 +45,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/scrollableDataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/scrollableDataTable/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/scrollableDataTable/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -70,17 +70,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/separator/pom.xml =================================================================== --- branches/community/3.3.X/ui/separator/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/separator/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/simpleTogglePanel/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/spacer/pom.xml =================================================================== --- branches/community/3.3.X/ui/spacer/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/spacer/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/state/pom.xml =================================================================== --- branches/community/3.3.X/ui/state/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/state/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -37,7 +37,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/suggestionbox/pom.xml =================================================================== --- branches/community/3.3.X/ui/suggestionbox/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/suggestionbox/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/tabPanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/tabPanel/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/tabPanel/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/togglePanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/togglePanel/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/togglePanel/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/toolBar/pom.xml =================================================================== --- branches/community/3.3.X/ui/toolBar/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/toolBar/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/tooltip/pom.xml =================================================================== --- branches/community/3.3.X/ui/tooltip/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/tooltip/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/tree/pom.xml =================================================================== --- branches/community/3.3.X/ui/tree/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/tree/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/treeModel/pom.xml =================================================================== --- branches/community/3.3.X/ui/treeModel/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/treeModel/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,12 +45,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/treeTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/treeTable/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/treeTable/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/virtualEarth/pom.xml =================================================================== --- branches/community/3.3.X/ui/virtualEarth/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) +++ branches/community/3.3.X/ui/virtualEarth/pom.xml 2009-05-18 15:37:29 UTC (rev 14241) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14240 - trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-05-18 11:14:42 -0400 (Mon, 18 May 2009) New Revision: 14240 Removed: trunk/.svnignore trunk/cdk/ trunk/deployRelease.sh trunk/developmentBuild.sh trunk/docs/ trunk/examples/ trunk/extensions/ trunk/framework/ trunk/markRelease.sh trunk/pom.xml trunk/prepareRelease.sh trunk/release notes.txt trunk/richfaces_classes.xls trunk/samples/ trunk/sandbox/ trunk/src/ trunk/test-applications/ trunk/ui/ Log: trunk cleared Deleted: trunk/.svnignore =================================================================== --- trunk/.svnignore 2009-05-18 15:05:22 UTC (rev 14239) +++ trunk/.svnignore 2009-05-18 15:14:42 UTC (rev 14240) @@ -1,3 +0,0 @@ -.project -.settings -.classpath Deleted: trunk/deployRelease.sh =================================================================== --- trunk/deployRelease.sh 2009-05-18 15:05:22 UTC (rev 14239) +++ trunk/deployRelease.sh 2009-05-18 15:14:42 UTC (rev 14240) @@ -1,40 +0,0 @@ -settings=~/.m2t/settings.xml - -case "`uname`" in - CYGWIN*) settings=`cygpath -w $settings` ;; -esac - -PROJECT_DIR=`pwd` - -mvn -s $settings -P local,docs,release clean deploy -N -cd $PROJECT_DIR/cdk -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/framework -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/ui -mvn -s $settings -P local,docs,release clean deploy -N -mvn -s $settings -P local,docs,release clean install -cd $PROJECT_DIR/docs -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/ui/assembly -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/extensions -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/samples -mvn -s $settings -P local,docs,release clean deploy -N -cd $PROJECT_DIR/samples/laguna -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/samples/glassX -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/samples/darkX -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/samples/themes -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/samples/violetRays -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/samples/richfaces-demo -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/examples/photoalbum -mvn -s $settings -P local,docs,release clean deploy -cd $PROJECT_DIR/examples/photoalbum/assembly -mvn -s $settings -P local,docs,release clean install \ No newline at end of file Deleted: trunk/developmentBuild.sh =================================================================== --- trunk/developmentBuild.sh 2009-05-18 15:05:22 UTC (rev 14239) +++ trunk/developmentBuild.sh 2009-05-18 15:14:42 UTC (rev 14240) @@ -1,19 +0,0 @@ -PROJECT_DIR=`pwd` - -mvn clean install -N -Dmaven.test.skip=true -cd $PROJECT_DIR/cdk -mvn clean install -Dmaven.test.skip=true -cd $PROJECT_DIR/framework -mvn clean install -Dmaven.test.skip=true -cd $PROJECT_DIR/ui -mvn clean install -Dmaven.test.skip=true -#cd $PROJECT_DIR/docs -#mvn clean install -cd $PROJECT_DIR/ui/assembly -mvn clean install -Dmaven.test.skip=true -#cd $PROJECT_DIR/extensions -#mvn clean install -#cd $PROJECT_DIR/samples -#mvn clean install -N -#cd $PROJECT_DIR/samples/richfaces-demo -#mvn clean install Deleted: trunk/markRelease.sh =================================================================== --- trunk/markRelease.sh 2009-05-18 15:05:22 UTC (rev 14239) +++ trunk/markRelease.sh 2009-05-18 15:14:42 UTC (rev 14240) @@ -1,14 +0,0 @@ -#!/bin/sh -mvn scm:checkout -DconnectionType=developerConnection -cd target/checkout -mvn release:branch -P docs -DdryRun=true -DautoVersionSubmodules=true \ - -DbranchName=$1 -DupdateBranchVersions=true \ - -DupdateVersionsToSnapshot=false \ - -DupdateWorkingCopyVersions=false \ - -DtagBase=https://svn.jboss.org/repos/richfaces/tags <<-EOF -$1 -EOF -find . -name pom.xml.branch -execdir mv pom.xml.branch pom.xml ';' -#mvn install -#cd .. -#svn copy checkout https://svn.jboss.org/repos/richfaces/tags/$1 -m " create tag for a release $1" \ No newline at end of file Deleted: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-18 15:05:22 UTC (rev 14239) +++ trunk/pom.xml 2009-05-18 15:14:42 UTC (rev 14240) @@ -1,416 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>root</artifactId> - <packaging>pom</packaging> - <name>Jboss RichFaces project</name> - <version>3.3.1-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossrichfaces</url> - <properties> - <snapshotRepository> - dav:https://snapshots.jboss.org/maven2 - </snapshotRepository> - </properties> - <dependencies /> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - <extension> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> - </extension> -  - </extensions> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> - <configuration> - <archive> - <index>true</index> - <manifest> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <mode>development</mode> - <Build-Number> - ${buildNumber} - </Build-Number> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.2</version> - <configuration> - <systemProperties> -  - <property> - <name>org.ajax4jsf.test.checkXHTML</name> - <value>true</value> - </property> - </systemProperties> - </configuration> -</plugin> - - </plugins> - </pluginManagement> - </build> - <modules> - <module>cdk</module> - <module>framework</module> - <module>ui</module> - <module>extensions</module> - <module>docs</module> - <module>ui/assembly</module> - <module>samples</module> -  - </modules> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> - </repository> - - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>atlassian-m2-repository</id> - <name>Atlassian Maven 2.x Repository</name> - <url>http://repository.atlassian.com/maven2</url> - </pluginRepository> - </pluginRepositories> - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossrichfaces/downloads - </downloadUrl> - <repository> - <id>repository.jboss.org</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> -  - </distributionManagement> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/jira/browse/RF</url> - </issueManagement> - <ciManagement> - <system>cruisecontrol</system> - </ciManagement> - <developers> - <developer> - <id>alexsmirnov</id> - <name>Alexander Smirnov</name> - <email>alexsmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>-3</timezone> - </developer> - <developer> - <id>ishabalov</id> - <name>Igor Shabalov</name> - <email>ishabalov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - <developer> - <id>sergeysmirnov</id> - <name>Sergey Smirnov</name> - <email>sergeysmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - <developer> - <id>nbelayevsky</id> - <name>Nik Belyaevsky</name> - <email>nbelayevsky(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>-2</timezone> - </developer> - </developers> - <licenses> - <license> - <name>LGPL 2.1</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments> - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - </comments> - </license> - </licenses> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk</developerConnection> - <url>https://svn.jboss.org/repos/richfaces/trunk</url> - </scm> - <profiles> - <profile> - <id>sandbox</id> - <modules> - <module>sandbox</module> - </modules> - </profile> - <profile> - <id>eclipse-custom-templates</id> - <build> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <configuration> - <additionalConfig> - <file> - <name> - .settings/org.eclipse.jdt.ui.prefs - </name> - <content> - <![CDATA[ - eclipse.preferences.version=1 - org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * $${tags}\r\n * <br /><br />\r\n * \r\n * Created $${date}\r\n * @author $${user}\r\n * @since ${project.artifact.selectedVersion.majorVersion}.${project.artifact.selectedVersion.minorVersion}\r\n */\r\n</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * License Agreement.\r\n *\r\n * JBoss RichFaces - Ajax4jsf Component Library\r\n *\r\n * Copyright (C) 2007 Exadel, Inc.\r\n *\r\n * This library is free software; you can redistribute it and/o! r\r\n * modify it under the terms of the GNU Lesser General Public\r\n * License version 2.1 as published by the Free Software Foundation.\r\n *\r\n * This library is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r\n * Lesser General Public License for more details.\r\n *\r\n * You should have received a copy of the GNU Lesser General Public\r\n * License along with this library; if not, write to the Free Software\r\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\r\n */\r\n</template></templates> - ]]> - </content> - </file> - </additionalConfig> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>clover</id> - <build> - <plugins> - <plugin> - <groupId>com.atlassian.maven.plugins</groupId> - <artifactId>maven-clover2-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <includesAllSourceRoots> - true - </includesAllSourceRoots> - <licenseLocation> - ${clover.license.path} - </licenseLocation> - <jdk>1.5</jdk> - </configuration> - <executions> - <execution> - <id>site</id> - <phase>verify</phase> - <goals> - <goal>instrument</goal> - </goals> - </execution> - <execution> - <id>site-aggregate</id> - <phase>pre-site</phase> - <goals> - <goal>aggregate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> - <reporting> - <plugins> - <plugin> - <groupId>com.atlassian.maven.plugins</groupId> - <artifactId>maven-clover2-plugin</artifactId> - <configuration> - <licenseLocation>${clover.license.path}</licenseLocation> - <jdk>1.5</jdk> - <configuration> - <generateHtml>true</generateHtml> - <generateXml>true</generateXml> - </configuration> - </configuration> - </plugin> - </plugins> - </reporting> - </profile> - <profile> - <id>beet</id> - <activation> - <property> - <name>mangelWurzel</name> - </property> - </activation> - <pluginRepositories> - <pluginRepository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - </pluginRepository> - </pluginRepositories> - <build> - - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>dashboard-maven-plugin</artifactId> - <version>1.0-SNAPSHOT</version> - <configuration> - <dialect>org.hibernate.dialect.PostgreSQLDialect</dialect> - <driverClass>org.postgresql.Driver</driverClass> - <username>${dashboard.username}</username> - <password>${dashboard.password}</password> - </configuration> - <dependencies> - <dependency> -  - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.1</version> - <configuration> - <configLocation>src/main/reports/exadel-checks.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.3</version> - <configuration> - <rulesets> - <ruleset>src/main/reports/PMDExadelRuleSet.xml</ruleset> - </rulesets> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>dashboard-maven-plugin</artifactId> - <version>1.0-SNAPSHOT</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>1.2</version> - <configuration> - <xmlOutput>true</xmlOutput> - <onlyAnalyze>org.richfaces.-, org.ajax4jsf.-</onlyAnalyze> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <configuration> - <tags> - <tag>@fixme</tag> - <tag>FIXME</tag> - <tag>@todo</tag> - <tag>TODO</tag> - </tags> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - <version>2.0-beta-2</version> - </plugin> - </plugins> - </reporting> - <distributionManagement> - <site> - <url>${mangelWurzel}</url> - </site> - </distributionManagement> - </profile> - </profiles> -</project> Deleted: trunk/prepareRelease.sh =================================================================== --- trunk/prepareRelease.sh 2009-05-18 15:05:22 UTC (rev 14239) +++ trunk/prepareRelease.sh 2009-05-18 15:14:42 UTC (rev 14240) @@ -1,13 +0,0 @@ -#!/bin/sh -mvn scm:checkout -DconnectionType=developerConnection -cd target/checkout -mvn release:prepare -P docs,release -DautoVersionSubmodules=true \ - -Darguments="-P docs,release" \ - -Dtag=$1 -DpreparationGoals="install" \ - -DtagBase=https://svn.jboss.org/repos/richfaces/tags <<-EOF -$1 -EOF -#find . -name pom.xml.branch -execdir mv pom.xml.branch pom.xml ';' -#mvn install -#cd .. -#svn copy checkout https://svn.jboss.org/repos/richfaces/tags/$1 -m " create tag for a release $1" \ No newline at end of file Deleted: trunk/release notes.txt =================================================================== --- trunk/release notes.txt 2009-05-18 15:05:22 UTC (rev 14239) +++ trunk/release notes.txt 2009-05-18 15:14:42 UTC (rev 14240) @@ -1,152 +0,0 @@ -Release Notes - RichFaces - Version 3.2.0 -** Bug - * [RF-894] - PanelMenu: chevron icons are inconsistent with the spec - * [RF-910] - Tooltip javascript error - * [RF-945] - calendar. Selection doesn't applied with a4j:support inside calendar - * [RF-956] - Messages produce unnessesarry html when no messages exsist. - * [RF-973] - Sorting doesn't work after rerender ScrollableDataTable using ajax. - * [RF-981] - Menu Components do not support non-latin character - * [RF-984] - Calendar exception - * [RF-992] - calendar: the typo in style attribute - - -** Feature Request - - -** Task - - - - -Release Notes - RichFaces - Version 3.0.1 - -** Bug - * [RF-2] - problem with z-index when modalPanel is used with tabPanel - * [RF-3] - drag-n-drop: the panel is transparent for dropping in IE if graphic image is dragged - * [RF-5] - The content of the rich components is not rendered if particular components are direct children - * [RF-7] - SuggestionBox not working in IE - * [RF-8] - Suggestion Box doesn't align correctly in IE - * [RF-13] - input cursor is invisible inside the modalPanel - * [RF-14] - iteration components shows wrong data if there are pointed with ReRender - * [RF-17] - DataScrollerEvent actioListener method is not invoked the first time when scrolling occurs - * [RF-18] - ModalPanel displaying a white column on right side of panel - * [RF-19] - rich:dataTable, rich:columnGroup ignore use 'renderer' attribute for columns. - * [RF-21] - DnD: the background of the component is transparent for Drop - * [RF-22] - dnd: the drag operation must stop when user releases the mouse button event the cursor is out of the browser window at this moment - * [RF-23] - datascroller: renderIfSinglePage="false" does not work correctly - * [RF-24] - NPE from Drag/Drop Support classes if a component is added, then removed from a UIComponent children collection - * [RF-25] - Suggestion Box doesn't implement AjaxSource - * [RF-26] - tabPanel: exception occurs when tabPanel with switchType="client" has a h:form around - * [RF-28] - datascroller: Exception in the SNAPSHOT version - * [RF-30] - TabPanel: IllegalArgumentException on MyFaces - * [RF-33] - In tree DropEvent.getDropValue() is always showing up as null - * [RF-36] - datascroller: remove unnecessary attribute name from the top div - * [RF-37] - dataTable is re-rendered incorrect when the records are deleted - * [RF-38] - a4j:include does not work as expected inside tabPanel - * [RF-41] - Label of dragIndicators disappeared - * [RF-42] - Exception on starting Gmap project - * [RF-43] - Question-mark appeared after label of simple toggle panel - * [RF-45] - dataTable has wrong representation for the empty fields. - * [RF-47] - inputNumberSpinner: the look-n-feel is not good inside the dataTable cell - * [RF-48] - DnD: components having dragType not assigned should not initiate drag - * [RF-50] - Tree selection may stop working if more than one node is refreshed at a time - * [RF-52] - modalPanel: ModalPanel via https. annoying warning appears - * [RF-53] - Drag Indicator's acceptClass and rejectClass attributes don't work - * [RF-54] - DnD: DnDEventsExchangeMailer got confused by components with simultaneous drag & drop capabilities - * [RF-58] - Hitting escape reopens the suggestion box after closure - * [RF-65] - SimpleTogglePanel encodes wrong </form> element in client mode - * [RF-66] - Suggestion Box positioned incorreclty in FireFox 2.0.0.3 - * [RF-67] - panelBar: Rendering bug with CSS - * [RF-68] - rich:dataTable: the style attribute for rich:columnGroup is ignored - * [RF-70] - dataTable: onRowXXXX events are not rendered if columns are united with rich:columnGroup - * [RF-71] - Tabs doesn't fill Ajax-update-Ids field with the own reRender value - * [RF-72] - h:commandLink does not work in rich:dataTable - * [RF-73] - Controls underneath a suggestionbox - inaccessible. - * [RF-74] - Data Scroller doesn't works in the footer facet - * [RF-76] - Tree does not render node added in action listener until second refresh - * [RF-77] - Tree component should not allow explicit drag/drop value setting - * [RF-78] - TabPanel lost component state in "client" mode - * [RF-79] - Modal Panel positioned wrong in Opera 9.10 - * [RF-83] - dataTable: the column on the same row is not updated in the latest snapshot. Focus is lost in FF - * [RF-91] - datascroller. actionListener is not invoked - * [RF-92] - tree. incorrect style definition for imgaes inside nodes - * [RF-95] - inputNumberSlider: slider reproduces wrong value when spinner works fine - * [RF-97] - inputNumberSpinner doesn't render onblur - * [RF-98] - table: incorrect style paramater - * [RF-99] - datatablescroller: style and class contain unnecessary value - * [RF-101] - Rerender table, reset datascroller - * [RF-104] - DataFilterSlider: slider doesn't slide - * [RF-107] - simpleTogglePanel actionListener is not called - * [RF-108] - simpleTogglePanel: duplicate class attribute rendering is invalid XHTML - * [RF-111] - tree: Exception when user clicks a4:commandLink on the same page outside the Tree - * [RF-112] - If inputText linked to rich:suggestionBox fails validation then the suggestionBox will not redisplay without page refresh - * [RF-113] - ModalPanel: shadow decoration - * [RF-116] - richfaces-demo: FF 2.0. The border of the left panels does not feet the panels - * [RF-123] - tab: onclick does not work - * [RF-125] - suggestionBox on demo: background disappears when the first char is typed - * [RF-128] - tree: dnd: start draging close to the boundary of the node makes Dnd functionality unstable - * [RF-132] - menu: page is scrolled up after ajax call - * [RF-134] - menu: menu overlapping in IE - * [RF-136] - menu: black border around the menu label in IE - * [RF-137] - menu: menu label look-n-feels are too different depends of the skin and browser - * [RF-140] - menu: default value for hideDelay and and showDelay attribute - * [RF-142] - menu: mode should be renamed to submitMode - * [RF-144] - menu: warning message on console - * [RF-147] - menu: the height of the label should be set to auto - * [RF-150] - Suggestionbox - in IE6, if you type a character, and then click on an item in the list (with the mouse), and then press Tab, it won't tab out of the field - * [RF-151] - Hide unnecessary attributes for some components. - * [RF-154] - Suggestion do not appears for the second time - * [RF-173] - Exception on trying to open page with suggestion in Firefox - * [RF-177] - DataScroller isn't rendered placed before table in JSF 1.1 env - * [RF-178] - SuggestionBox: incorrect popup positioning, when parent has position:absolute - * [RF-180] - SuggestionBox positioned wrong on demoSite - * [RF-184] - dataScroller duplicate style and class attribute if specified - * [RF-190] - dropDownMenu: showDelay and hideDelay do not work in IE - * [RF-192] - exception: stateOrder for togglePanel shouldn't be empty - * [RF-193] - TogglePanel: panel stops to switch after several changing of switchType - * [RF-194] - Isn't possible to select text inside inputs via mouse in IE 6. - * [RF-196] - DropDownMenu: menu is blinking after changing any parameter - * [RF-197] - DropDownMenu has wrong style appearence in Firefox 2.0 - * [RF-200] - Separator: separator doesn't displayed - * [RF-202] - Tree : ConnectingLines doesn't displayed - * [RF-205] - Suggestion Box : transparent suggestion appeares - * [RF-208] - modal panel can't be displayed in Safari if attribute resizeable seted to false - * [RF-212] - rich:suggestionbox doesn't work inside rich:simpleTogglePanel - * [RF-222] - DDMenu. Disabled item do not change its color - * [RF-223] - Separator: separator isn't displayed after each parameter changing - * [RF-227] - DataFilterSlider: slider dissapeares in right end position in Firefox - * [RF-228] - DDMenu. Disabled note still can be highlighted - * [RF-229] - DropDownMenu: bad appearence of 2nd level menu - * [RF-231] - Spacer: XML error - * [RF-232] - Tab Panel: can't open component - * [RF-233] - Suggestion Box : can't invoke suggestion in Opera - * [RF-235] - SuggestionBox: suggestion isn't disappeared - * [RF-239] - panelMenu: <imgs> are not closed properly. - * [RF-242] - Menu Group. can't customize icons - * [RF-243] - Action Listener isn't invoked by DEFAULT on the menuItem - * [RF-245] - If there is only one item on the last page of a datatable, datascroller then the next buttons disappear - - -** Feature Request - * [RF-4] - Add expression or the current row index of rich:dataTable - * [RF-10] - Allow ajaxSingle for suggestionBox to make it possible to use other fields values in the suggestion action - * [RF-11] - SuggestionBox: assign default values for width and height - * [RF-15] - Add support for facets in rich:datascroller - * [RF-29] - add Impementation-Version to MANIFEST.MF - * [RF-32] - Add DnD parameters to dragIndicator - * [RF-81] - suggestion box. Enable onsubmit to to make it possible to discard ajax request - * [RF-84] - Create RichFaces resources descriptors - * [RF-87] - Tree - make selection submit on mouse up - * [RF-102] - Tree - Need ability to disable node selection - * [RF-120] - datatablescroller: add align attribute - * [RF-220] - tree: icon*, leaf facets - - - -** Task - * [RF-9] - The RichFaces Developer Guide for the suggestionBox states that the autocomplete method should take a SuggestionEvent, but it appears that it takes an Object instead - * [RF-94] - tree: add alt="" to the images in the template - * [RF-135] - menu: menu is shown too big by default - * [RF-145] - menu: remove gradient for focused items - * [RF-185] - Unit testing: check & update - Deleted: trunk/richfaces_classes.xls =================================================================== (Binary files differ)

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14239 - branches/community.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-05-18 11:05:22 -0400 (Mon, 18 May 2009) New Revision: 14239 Added: branches/community/3.3.X/ Log: community/3.3.X branch created from trunk Copied: branches/community/3.3.X (from rev 14238, trunk)

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14238 - branches.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-05-18 10:55:17 -0400 (Mon, 18 May 2009) New Revision: 14238 Added: branches/community/ Log: community folder committed

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14237 - trunk/docs/common-resources/en/src/main/images.

by richfaces-svn-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-18 08:02:16 -0400 (Mon, 18 May 2009) New Revision: 14237 Removed: trunk/docs/common-resources/en/src/main/images/rf_logo.gif Log: https://jira.jboss.org/jira/browse/RF-7014 - deleting unnecessary image; Deleted: trunk/docs/common-resources/en/src/main/images/rf_logo.gif =================================================================== (Binary files differ)

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r14236 - trunk/docs/common-resources/en/src/main/images.

by richfaces-svn-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-18 07:58:26 -0400 (Mon, 18 May 2009) New Revision: 14236 Added: trunk/docs/common-resources/en/src/main/images/rf_logo.png Log: https://jira.jboss.org/jira/browse/RF-7014 - updating the RichFaces logo image; Added: trunk/docs/common-resources/en/src/main/images/rf_logo.png =================================================================== (Binary files differ) Property changes on: trunk/docs/common-resources/en/src/main/images/rf_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 1 month

1
0
0 / 0

← Newer
1
...
15
16
17
18
19
20
21
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits May 2009