Author: nbelaevski Date: 2010-10-27 12:32:43 -0400 (Wed, 27 Oct 2010) New Revision: 19705 Added: branches/RF-7817/svn.externals Modified: branches/RF-7817/bom/pom.xml branches/RF-7817/dist/readme-examples.txt branches/RF-7817/dist/readme-ui.txt branches/RF-7817/parent/pom.xml branches/RF-7817/ui/dist/richfaces-components-api/pom.xml branches/RF-7817/ui/dist/richfaces-components-ui/pom.xml Log: Merged revisions 19156-19157,19159-19160,19176,19186-19187,19190,19194,19196,19199,19203-19204,19231-19234,19248-19249,19255-19256,19258-19262,19276,19279-19281,19283,19285,19291-19299,19307,19312,19315,19318-19319,19325,19341-19342,19345-19351,19353-19355,19358-19359,19364,19367-19369,19371,19374-19377,19379-19385,19387,19393-19394,19400,19402-19404,19418-19422,19426,19430-19431,19434-19441,19443-19444,19446,19468,19470,19477,19491,19498-19499,19501,19504,19506-19507,19517-19519,19525,19542-19543,19548,19550,19555,19557,19560-19561,19565-19566,19571-19573,19582-19585,19592-19593,19599,19601-19602,19613,19646,19657-19659,19665,19671-19674 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk Modified: branches/RF-7817/bom/pom.xml =================================================================== --- branches/RF-7817/bom/pom.xml 2010-10-27 16:28:07 UTC (rev 19704) +++ branches/RF-7817/bom/pom.xml 2010-10-27 16:32:43 UTC (rev 19705) @@ -139,12 +139,12 @@ <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-impl</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </dependency> <!-- Misc --> Modified: branches/RF-7817/dist/readme-examples.txt =================================================================== --- branches/RF-7817/dist/readme-examples.txt 2010-10-27 16:28:07 UTC (rev 19704) +++ branches/RF-7817/dist/readme-examples.txt 2010-10-27 16:32:43 UTC (rev 19705) @@ -1,6 +1,6 @@ RichFaces 4.0 Examples ========================================================= -Version 4.0.0.M2 +Version 4.0.0.M3 This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt). @@ -21,11 +21,11 @@ More additional information about build profiles for concrete applications and working with them - inside readme's for application itself. -NEW for M2: richfaces-showcase contains readme.txt which shows how to publish the application to Google Application Engine. +NOTE: richfaces-showcase contains readme.txt which shows how to publish the application to Google Application Engine. Using IDE to work with examples ------------------------------- - *You could use Jboss Tools with m2eclipse plugin and just import the examples as maven-based projects. + *You could use JBoss Tools with m2eclipse plugin and just import the examples as maven-based projects. *Or if you have not using m2eclipse - execute: mvn eclipse:ecllipse Modified: branches/RF-7817/dist/readme-ui.txt =================================================================== --- branches/RF-7817/dist/readme-ui.txt 2010-10-27 16:28:07 UTC (rev 19704) +++ branches/RF-7817/dist/readme-ui.txt 2010-10-27 16:32:43 UTC (rev 19705) @@ -1,6 +1,6 @@ RichFaces - Ajax enabled JSF 2.0 component library ========================================================= -Version 4.0.0.M2 +Version 4.0.0.M3 This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt). @@ -8,18 +8,18 @@ ------------------------------- 1) Put RichFaces libraries and its dependencies in your application libraries folder: - 1.1) richfaces-core-api-4.0.0.20100824-M2.jar - 1.2) richfaces-core-impl-4.0.0.20100824-M2.jar - 1.3) richfaces-components-api-4.0.0.20100824-M2.jar - 1.4) richfaces-components-ui-4.0.0.20100824-M2.jar + 1.1) richfaces-core-api-4.0.0.20101004-M3.jar + 1.2) richfaces-core-impl-4.0.0.20101004-M3.jar + 1.3) richfaces-components-api-4.0.0.20101004-M3.jar + 1.4) richfaces-components-ui-4.0.0.20101004-M3.jar 1.5) sac-1.3, cssparser-0.9.5 - required for components CSS work 1.6) google-guava-r06 - core runtime dependency. - 1.7) annotations.jar from org.richfaces.cdk . It's optional and should be added only if some RichFaces components will be - created/accessed dynamically from some appication actions/listeners. + 1.7) annotations.jar from org.richfaces.cdk + - It's optional and only needs to be added if RichFaces components will be + created/accessed dynamically in your apps actions/listeners. For optimal performance it's recommended to add one of these caching frameworks to application classpath: EhCache, JBoss Cache, OsCache. - 2) As opposed to the previous 3.x.y versions of RichFaces, no special configuration steps are necessary. You don't need to modify web.xml or faces-config.xml @@ -27,8 +27,8 @@ Use xmlns:a4j="http://richfaces.org/a4j" namespace for core components Use xmlns:rich="http://richfaces.org/rich" namespace for rich components -4) Add one of the available RichFaces 4.0.M2 components to your page and try it! - 4.1) Take a look at the RichFaces examples for assistance with usage. +4) Add one of the available RichFaces 4.0.M3 components to your page and try it! +4.1) Take a look at the RichFaces examples for assistance with usage. Available Components/Behaviors/Tags/Functions @@ -81,21 +81,25 @@ --------------------------------- Output: --------------------------------- +rich:collapsiblePanel rich:panel rich:popupPanel +rich:tabPanel rich:togglePanel rich:toggleControl rich:togglePanelItem rich:itemChangeListener rich:accordion rich:accordionItem +rich:progressBar --------------------------------- -Output: +Input: --------------------------------- rich:autocomplete rich:inplaceInput rich:inputNumberSlider +rich:inputNumberSpinner Learn more ---------- Modified: branches/RF-7817/parent/pom.xml =================================================================== --- branches/RF-7817/parent/pom.xml 2010-10-27 16:28:07 UTC (rev 19704) +++ branches/RF-7817/parent/pom.xml 2010-10-27 16:32:43 UTC (rev 19705) @@ -163,10 +163,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> + <version>2.5</version> <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml - </configLocation> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> + <logViolationsToConsole>true</logViolationsToConsole> + <violationSeverity>error</violationSeverity> </configuration> <executions> <execution> @@ -378,13 +379,13 @@ <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-impl</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> Copied: branches/RF-7817/svn.externals (from rev 19674, trunk/svn.externals) =================================================================== --- branches/RF-7817/svn.externals (rev 0) +++ branches/RF-7817/svn.externals 2010-10-27 16:32:43 UTC (rev 19705) @@ -0,0 +1,3 @@ +build/parent http://anonsvn.jboss.org/repos/richfaces/modules/build/parent/tags/richfa... +build/checkstyle http://anonsvn.jboss.org/repos/richfaces/modules/build/resources/tags/ric... +build/faces-shade-transformers https://svn.jboss.org/repos/richfaces/modules/build/resources/tags/richfa... \ No newline at end of file Modified: branches/RF-7817/ui/dist/richfaces-components-api/pom.xml =================================================================== --- branches/RF-7817/ui/dist/richfaces-components-api/pom.xml 2010-10-27 16:28:07 UTC (rev 19704) +++ branches/RF-7817/ui/dist/richfaces-components-api/pom.xml 2010-10-27 16:32:43 UTC (rev 19705) @@ -66,10 +66,6 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: branches/RF-7817/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- branches/RF-7817/ui/dist/richfaces-components-ui/pom.xml 2010-10-27 16:28:07 UTC (rev 19704) +++ branches/RF-7817/ui/dist/richfaces-components-ui/pom.xml 2010-10-27 16:32:43 UTC (rev 19705) @@ -78,10 +78,6 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -137,6 +133,9 @@ </taglibs> </transformer> <transformer implementation="org.richfaces.build.shade.resource.FacesConfigXmlResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource>META-INF/richfaces/resource-mappings.properties</resource> + </transformer> </transformers> </configuration> </execution>