August 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r18329 - in trunk: archetypes/richfaces-archetype-simpleapp and 86 other directories.

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

Author: alexsmirnov Date: 2010-08-02 19:13:11 -0400 (Mon, 02 Aug 2010) New Revision: 18329 Added: trunk/docs/Component_Reference/ trunk/docs/Developer_Guide/ trunk/docs/Migration_Guide/ trunk/docs/bundle_docs.sh trunk/docs/parent/ trunk/docs/pom.xml Removed: trunk/docs/trunk/Component_Reference/ trunk/docs/trunk/Developer_Guide/ trunk/docs/trunk/Migration_Guide/ trunk/docs/trunk/bundle_docs.sh trunk/docs/trunk/parent/ trunk/docs/trunk/pom.xml Modified: trunk/archetypes/richfaces-archetype-simpleapp/pom.xml trunk/archetypes/richfaces-component-short/pom.xml trunk/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml trunk/archetypes/richfaces-component/pom.xml trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/pom.xml trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml trunk/archetypes/richfaces-components-aggregator/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/bom/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/api/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/impl/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/ui/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/parent/pom.xml trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/pom.xml trunk/bom/pom.xml trunk/cdk/bom/pom.xml trunk/cdk/dist/pom.xml trunk/cdk/docs/Component_Development_Kit_Guide/pom.xml trunk/cdk/parent/pom.xml trunk/cdk/plugins/pom.xml trunk/cdk/pom.xml trunk/core/api/pom.xml trunk/core/bom/pom.xml trunk/core/commons/api/pom.xml trunk/core/commons/bom/pom.xml trunk/core/commons/parent/pom.xml trunk/core/commons/pom.xml trunk/core/impl/pom.xml trunk/core/parent/pom.xml trunk/core/pom.xml trunk/dist/pom.xml trunk/docs/Component_Reference/pom.xml trunk/docs/Developer_Guide/pom.xml trunk/docs/Migration_Guide/pom.xml trunk/docs/parent/pom.xml trunk/examples/core-demo/pom.xml trunk/examples/pom.xml trunk/examples/richfaces-showcase/pom.xml trunk/pom.xml trunk/ui/core/bom/pom.xml trunk/ui/core/parent/pom.xml trunk/ui/core/pom.xml trunk/ui/core/ui/pom.xml trunk/ui/dist/bom/pom.xml trunk/ui/dist/parent/pom.xml trunk/ui/dist/pom.xml trunk/ui/dist/richfaces-components-api/pom.xml trunk/ui/dist/richfaces-components-impl/pom.xml trunk/ui/dist/richfaces-components-ui/pom.xml trunk/ui/iteration/bom/pom.xml trunk/ui/iteration/datascroller/api/pom.xml trunk/ui/iteration/datascroller/pom.xml trunk/ui/iteration/datascroller/ui/pom.xml trunk/ui/iteration/dist/pom.xml trunk/ui/iteration/dist/richfaces-ui-iteration-api/pom.xml trunk/ui/iteration/dist/richfaces-ui-iteration-impl/pom.xml trunk/ui/iteration/dist/richfaces-ui-iteration-ui/pom.xml trunk/ui/iteration/lists/api/pom.xml trunk/ui/iteration/lists/pom.xml trunk/ui/iteration/lists/ui/pom.xml trunk/ui/iteration/parent/pom.xml trunk/ui/iteration/pom.xml trunk/ui/iteration/tables/api/pom.xml trunk/ui/iteration/tables/impl/pom.xml trunk/ui/iteration/tables/pom.xml trunk/ui/iteration/tables/ui/pom.xml trunk/ui/misc/bom/pom.xml trunk/ui/misc/componentcontrol/pom.xml trunk/ui/misc/dist/pom.xml trunk/ui/misc/dist/richfaces-ui-misc-ui/pom.xml trunk/ui/misc/functions/pom.xml trunk/ui/misc/jquery/pom.xml trunk/ui/misc/parent/pom.xml trunk/ui/misc/pom.xml trunk/ui/output/bom/pom.xml trunk/ui/output/dist/pom.xml trunk/ui/output/dist/richfaces-ui-output-api/pom.xml trunk/ui/output/dist/richfaces-ui-output-ui/pom.xml trunk/ui/output/panels/api/pom.xml trunk/ui/output/panels/pom.xml trunk/ui/output/panels/ui/pom.xml trunk/ui/output/parent/pom.xml trunk/ui/output/pom.xml Log: remove trunk folder from docs, fix scm url in pom.xmls Modified: trunk/archetypes/richfaces-archetype-simpleapp/pom.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -77,8 +77,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/archetypes/richface...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/archetypes/richfaces-a...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/archetypes/richfac...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/archetypes/richfaces-...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/archetypes/richfaces-component/pom.xml =================================================================== --- trunk/archetypes/richfaces-component/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-component/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -95,8 +95,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/archetypes/richface...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/archetypes/richfaces-c...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/archetypes/richfac...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/archetypes/richfaces-...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml =================================================================== --- trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -103,8 +103,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/$...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/${n...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/${name...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml =================================================================== --- trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -119,8 +119,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/$...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/${n...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/${name...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -40,8 +40,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/$...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/${n...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/${name}</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml =================================================================== --- trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -118,8 +118,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/$...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/${n...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/${name...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/archetypes/richfaces-component-short/pom.xml =================================================================== --- trunk/archetypes/richfaces-component-short/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-component-short/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -95,8 +95,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/archetypes/richface...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/archetypes/richfaces-c...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/archetypes/richfac...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/archetypes/richfaces-...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -113,8 +113,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/$...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/${n...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/${name}</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Modified: trunk/archetypes/richfaces-components-aggregator/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -95,8 +95,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/archetypes/richface...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/archetypes/richfaces-c...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/archetypes/richfac...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/archetypes/richfaces-...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -66,8 +66,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/bom/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -67,8 +67,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/bom</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/bom</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/api/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -145,8 +145,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/d...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/dis...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/dist/api</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/impl/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/impl/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/impl/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -152,8 +152,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/d...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/dis...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/dist/impl</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -51,8 +51,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/dist</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/dist</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/ui/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/dist/ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -198,8 +198,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/d...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/dis...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/dist/ui</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/parent/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -177,8 +177,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trun...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk/p...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}/parent</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/pom.xml =================================================================== --- trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/archetypes/richfaces-components-aggregator/src/main/resources/archetype-resources/trunk/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -66,8 +66,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/${category}/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/${category}/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/${category}</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/${category}</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/bom/pom.xml =================================================================== --- trunk/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -127,11 +127,11 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/bom/trunk + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/build/bom </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/bom/trunk + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/build/bom </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/build/bom/trunk</url> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/build/bom</url> </scm> </project> Modified: trunk/cdk/bom/pom.xml =================================================================== --- trunk/cdk/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/cdk/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -20,9 +20,9 @@ <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk/bom</developerConnection> - <url>http://fisheye.jboss.org/browse/Richfaces/cdk/trunk/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/Richfaces/cdk/bom</url> </scm> <build>  Modified: trunk/cdk/dist/pom.xml =================================================================== --- trunk/cdk/dist/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/cdk/dist/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -15,8 +15,8 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/dist</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk/dist</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk/dist</developerConnection> <url>http://fisheye.jboss.org/browse/Richfaces/cdk</url> </scm> <build> Modified: trunk/cdk/docs/Component_Development_Kit_Guide/pom.xml =================================================================== --- trunk/cdk/docs/Component_Development_Kit_Guide/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/cdk/docs/Component_Development_Kit_Guide/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -106,8 +106,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/docs/guide</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk/docs/guide</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/docs/guide</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk/docs/guide</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> Modified: trunk/cdk/parent/pom.xml =================================================================== --- trunk/cdk/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/cdk/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -23,9 +23,9 @@ <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk/parent</developerConnection> - <url>http://fisheye.jboss.org/browse/Richfaces/cdk/trunk/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/Richfaces/cdk/parent</url> </scm> <repositories> <repository> Modified: trunk/cdk/plugins/pom.xml =================================================================== --- trunk/cdk/plugins/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/cdk/plugins/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -14,9 +14,9 @@ <packaging>pom</packaging> <name>maven CDK plugins</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/plugins</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk/plugins</developerConnection> - <url>http://fisheye.jboss.org/browse/Richfaces/cdk/trunk/plugins</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/plugins</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk/plugins</developerConnection> + <url>http://fisheye.jboss.org/browse/Richfaces/cdk/plugins</url> </scm> <build> <plugins> Modified: trunk/cdk/pom.xml =================================================================== --- trunk/cdk/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/cdk/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -28,8 +28,8 @@ </modules>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk</developerConnection> <url>http://fisheye.jboss.org/browse/Richfaces/cdk</url> </scm> Modified: trunk/core/api/pom.xml =================================================================== --- trunk/core/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -97,8 +97,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/core/trunk/api</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/core/trunk/api</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/core/trunk/api</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core/api</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/core/api</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/core/api</url> </scm> </project> \ No newline at end of file Modified: trunk/core/bom/pom.xml =================================================================== --- trunk/core/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -73,9 +73,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/core/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/core/trunk/bom</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/core/trunk/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/core/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/core/bom</url> </scm> </project> Modified: trunk/core/commons/api/pom.xml =================================================================== --- trunk/core/commons/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/commons/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -72,8 +72,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/commons/trunk/api</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/commons/trunk/api</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/commons/trunk/api</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons/api</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons/api</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons/api</url> </scm> </project> \ No newline at end of file Modified: trunk/core/commons/bom/pom.xml =================================================================== --- trunk/core/commons/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/commons/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -62,9 +62,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/commons/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/commons/trunk/bom</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/commons/trunk/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons/bom</url> </scm> </project> Modified: trunk/core/commons/parent/pom.xml =================================================================== --- trunk/core/commons/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/commons/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -78,8 +78,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/commons/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/commons/trunk/parent</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/commons/trunk/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons/parent</url> </scm> </project> \ No newline at end of file Modified: trunk/core/commons/pom.xml =================================================================== --- trunk/core/commons/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/commons/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -42,9 +42,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/commons/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/commons/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/commons/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons</url> </scm> </project> Modified: trunk/core/impl/pom.xml =================================================================== --- trunk/core/impl/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/impl/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -256,8 +256,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/core/trunk/impl</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/core/trunk/impl</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/core/trunk/impl</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core/impl</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/core/impl</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/core/impl</url> </scm> </project> \ No newline at end of file Modified: trunk/core/parent/pom.xml =================================================================== --- trunk/core/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -101,8 +101,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/core/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/core/trunk/parent</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/core/trunk/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/core/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/core/parent</url> </scm> </project> \ No newline at end of file Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/core/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -44,9 +44,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/core/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/core/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/core</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/core</url> </scm> </project> Modified: trunk/dist/pom.xml =================================================================== --- trunk/dist/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/dist/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -206,8 +206,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/dist/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/dist/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/dist</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Copied: trunk/docs/Component_Reference (from rev 18328, trunk/docs/trunk/Component_Reference) Modified: trunk/docs/Component_Reference/pom.xml =================================================================== --- trunk/docs/trunk/Component_Reference/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/docs/Component_Reference/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -107,9 +107,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/docs/trunk/Componen...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/docs/trunk/Component_R...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/docs/Component_Ref...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/docs/Component_Reference</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/</url> </scm> </project> Copied: trunk/docs/Developer_Guide (from rev 18328, trunk/docs/trunk/Developer_Guide) Modified: trunk/docs/Developer_Guide/pom.xml =================================================================== --- trunk/docs/trunk/Developer_Guide/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/docs/Developer_Guide/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -108,9 +108,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/docs/trunk/Develope...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/docs/trunk/Developer_G...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/docs/Developer_Guide</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/docs/Developer_Guide</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/</url> </scm> </project> Copied: trunk/docs/Migration_Guide (from rev 18328, trunk/docs/trunk/Migration_Guide) Modified: trunk/docs/Migration_Guide/pom.xml =================================================================== --- trunk/docs/trunk/Migration_Guide/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/docs/Migration_Guide/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -108,9 +108,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/docs/trunk/Migratio...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/docs/trunk/Migration_G...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/docs/Migration_Guide</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/docs/Migration_Guide</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/</url> </scm> </project> Copied: trunk/docs/bundle_docs.sh (from rev 18328, trunk/docs/trunk/bundle_docs.sh) =================================================================== --- trunk/docs/bundle_docs.sh (rev 0) +++ trunk/docs/bundle_docs.sh 2010-08-02 23:13:11 UTC (rev 18329) @@ -0,0 +1,41 @@ +#!/bin/bash +# +# Script to bundle all docs +# Entire RichFaces source must be checked out to build the CDK Guide + +DOCSDIR=$(cd $(dirname "$0"); pwd) + +echo "[BUNDLE_DOCS] Enter version number: " +read VERSION +echo "[BUNDLE_DOCS] Creating bundle directory..." +mkdir $DOCSDIR/$VERSION + +echo "[BUNDLE_DOCS] Building docbook docs..." +mvn clean install + +echo "[BUNDLE_DOCS] Copying docs to bundle:" +echo "[BUNDLE_DOCS] -> Copying Component Reference..." +mkdir $DOCSDIR/$VERSION/Component_Reference +cp -r $DOCSDIR/Component_Reference/target/docbook/publish/* $DOCSDIR/$VERSION/Component_Reference/ +echo "[BUNDLE_DOCS] -> Copying Developer Guide..." +mkdir $DOCSDIR/$VERSION/Developer_Guide +cp -r $DOCSDIR/Developer_Guide/target/docbook/publish/* $DOCSDIR/$VERSION/Developer_Guide/ +echo "[BUNDLE_DOCS] -> Copying Migration Guide..." +mkdir $DOCSDIR/$VERSION/Migration_Guide +cp -r $DOCSDIR/Migration_Guide/target/docbook/publish/* $DOCSDIR/$VERSION/Migration_Guide/ + +echo "[BUNDLE_DOCS] Building CDK docs..." +cd ../.. +cd ./cdk/trunk/docs/Component_Development_Kit_Guide/ +mvn clean install + +echo "[BUNDLE_DOCS] Copying docs to bundle:" +echo "[BUNDLE_DOCS] -> Copying Component Development Kit Guide..." +mkdir $DOCSDIR/$VERSION/Component_Development_Kit_Guide +cp -r ./target/docbook/publish/* $DOCSDIR/$VERSION/Component_Development_Kit_Guide/ + +echo "[BUNDLE_DOCS] Zipping bundle..." +cd $DOCSDIR +zip -r $VERSION.zip $DOCSDIR/$VERSION + +echo "[BUNDLE_DOCS] Bundle complete." Copied: trunk/docs/parent (from rev 18328, trunk/docs/trunk/parent) Modified: trunk/docs/parent/pom.xml =================================================================== --- trunk/docs/trunk/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/docs/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -217,8 +217,8 @@ --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/docs/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/docs/trunk/parent</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/docs/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/docs/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/</url> </scm> </project> Copied: trunk/docs/pom.xml (from rev 18328, trunk/docs/trunk/pom.xml) =================================================================== --- trunk/docs/pom.xml (rev 0) +++ trunk/docs/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -0,0 +1,29 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>9</version> + </parent> + + <groupId>org.richfaces.docs</groupId> + <artifactId>docs-aggregator</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>RichFaces Document Aggregator</name> + + <modules> + <module>parent</module> + <module>Component_Reference</module> + <module>Developer_Guide</module> + <module>Migration_Guide</module> + </modules> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/root/docs</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/root/docs</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/</url> + </scm> +</project> + Deleted: trunk/docs/trunk/bundle_docs.sh =================================================================== --- trunk/docs/trunk/bundle_docs.sh 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/docs/trunk/bundle_docs.sh 2010-08-02 23:13:11 UTC (rev 18329) @@ -1,41 +0,0 @@ -#!/bin/bash -# -# Script to bundle all docs -# Entire RichFaces source must be checked out to build the CDK Guide - -DOCSDIR=$(cd $(dirname "$0"); pwd) - -echo "[BUNDLE_DOCS] Enter version number: " -read VERSION -echo "[BUNDLE_DOCS] Creating bundle directory..." -mkdir $DOCSDIR/$VERSION - -echo "[BUNDLE_DOCS] Building docbook docs..." -mvn clean install - -echo "[BUNDLE_DOCS] Copying docs to bundle:" -echo "[BUNDLE_DOCS] -> Copying Component Reference..." -mkdir $DOCSDIR/$VERSION/Component_Reference -cp -r $DOCSDIR/Component_Reference/target/docbook/publish/* $DOCSDIR/$VERSION/Component_Reference/ -echo "[BUNDLE_DOCS] -> Copying Developer Guide..." -mkdir $DOCSDIR/$VERSION/Developer_Guide -cp -r $DOCSDIR/Developer_Guide/target/docbook/publish/* $DOCSDIR/$VERSION/Developer_Guide/ -echo "[BUNDLE_DOCS] -> Copying Migration Guide..." -mkdir $DOCSDIR/$VERSION/Migration_Guide -cp -r $DOCSDIR/Migration_Guide/target/docbook/publish/* $DOCSDIR/$VERSION/Migration_Guide/ - -echo "[BUNDLE_DOCS] Building CDK docs..." -cd ../.. -cd ./cdk/trunk/docs/Component_Development_Kit_Guide/ -mvn clean install - -echo "[BUNDLE_DOCS] Copying docs to bundle:" -echo "[BUNDLE_DOCS] -> Copying Component Development Kit Guide..." -mkdir $DOCSDIR/$VERSION/Component_Development_Kit_Guide -cp -r ./target/docbook/publish/* $DOCSDIR/$VERSION/Component_Development_Kit_Guide/ - -echo "[BUNDLE_DOCS] Zipping bundle..." -cd $DOCSDIR -zip -r $VERSION.zip $DOCSDIR/$VERSION - -echo "[BUNDLE_DOCS] Bundle complete." Deleted: trunk/docs/trunk/pom.xml =================================================================== --- trunk/docs/trunk/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/docs/trunk/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -1,29 +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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> - </parent> - - <groupId>org.richfaces.docs</groupId> - <artifactId>docs-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>RichFaces Document Aggregator</name> - - <modules> - <module>parent</module> - <module>Component_Reference</module> - <module>Developer_Guide</module> - <module>Migration_Guide</module> - </modules> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/docs/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/docs/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/</url> - </scm> -</project> - Modified: trunk/examples/core-demo/pom.xml =================================================================== --- trunk/examples/core-demo/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/examples/core-demo/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -272,8 +272,8 @@ </repositories> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/examples/core-demo/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/examples/core-demo/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/core-demo</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/core-demo</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/examples/pom.xml =================================================================== --- trunk/examples/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/examples/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -44,7 +44,7 @@ <module>repeater-demo</module> <module>iteration-demo</module> <module>richfaces-showcase</module> -  +  </modules> </project> \ No newline at end of file Modified: trunk/examples/richfaces-showcase/pom.xml =================================================================== --- trunk/examples/richfaces-showcase/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/examples/richfaces-showcase/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -261,8 +261,8 @@ </repositories> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/examples/richfaces-...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/examples/richfaces-sho...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/richfaces-sh...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -32,7 +32,7 @@  <module>archetypes</module> <module>examples</module> - <module>docs/trunk</module> + <module>docs</module> </modules> <profiles> Modified: trunk/ui/core/bom/pom.xml =================================================================== --- trunk/ui/core/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/core/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -57,8 +57,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk/bom</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/core/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/core/bom</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/ui/core/parent/pom.xml =================================================================== --- trunk/ui/core/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/core/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -173,8 +173,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/core/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/core/parent</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/ui/core/pom.xml =================================================================== --- trunk/ui/core/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/core/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/core</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/core/ui/pom.xml =================================================================== --- trunk/ui/core/ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/core/ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -119,9 +119,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk/ui + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/core/ui </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk/ui + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/core/ui </developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/dist/bom/pom.xml =================================================================== --- trunk/ui/dist/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/dist/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -111,9 +111,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/bom</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/root/ui/dist/trunk/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/dist/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/dist/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/ui/dist/bom</url> </scm> </project> Modified: trunk/ui/dist/parent/pom.xml =================================================================== --- trunk/ui/dist/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/dist/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -47,8 +47,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/dist/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/dist/parent</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/ui/dist/pom.xml =================================================================== --- trunk/ui/dist/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/dist/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -79,17 +79,17 @@ <id>build-force</id> <modules> - <module>../../core/trunk</module> - <module>../../misc/trunk/dist</module> - <module>../../iteration/trunk/dist</module> - <module>../../output/trunk/dist</module> + <module>../../core</module> + <module>../../misc/dist</module> + <module>../../iteration/dist</module> + <module>../../output/dist</module> </modules> </profile> </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/dist</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/dist/richfaces-components-api/pom.xml =================================================================== --- trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -177,8 +177,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/richf...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/richface...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/dist/richfaces-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/dist/richfaces-com...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/dist/richfaces-components-impl/pom.xml =================================================================== --- trunk/ui/dist/richfaces-components-impl/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/dist/richfaces-components-impl/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -207,8 +207,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/richf...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/richface...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/dist/richfaces-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/dist/richfaces-com...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -246,8 +246,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/richf...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/richface...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/dist/richfaces-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/dist/richfaces-com...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/iteration/bom/pom.xml =================================================================== --- trunk/ui/iteration/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -96,8 +96,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/bom</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/bom</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/ui/iteration/datascroller/api/pom.xml =================================================================== --- trunk/ui/iteration/datascroller/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/datascroller/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -97,8 +97,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dat...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/datas...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/datascro...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/iteration/datascroller/pom.xml =================================================================== --- trunk/ui/iteration/datascroller/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/datascroller/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dat...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/datas...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/datascro...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/datascroller/ui/pom.xml =================================================================== --- trunk/ui/iteration/datascroller/ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/datascroller/ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -128,8 +128,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dat...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/datas...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/datascro...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/iteration/dist/pom.xml =================================================================== --- trunk/ui/iteration/dist/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/dist/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -54,8 +54,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dist</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/dist</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/ui/iteration/dist/richfaces-ui-iteration-api/pom.xml =================================================================== --- trunk/ui/iteration/dist/richfaces-ui-iteration-api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/dist/richfaces-ui-iteration-api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -162,8 +162,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dis...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/dist/...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/dist/ric...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/dist/richfaces-ui-iteration-impl/pom.xml =================================================================== --- trunk/ui/iteration/dist/richfaces-ui-iteration-impl/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/dist/richfaces-ui-iteration-impl/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -159,8 +159,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dis...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/dist/...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/dist/ric...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/dist/richfaces-ui-iteration-ui/pom.xml =================================================================== --- trunk/ui/iteration/dist/richfaces-ui-iteration-ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/dist/richfaces-ui-iteration-ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -225,8 +225,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dis...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/dist/...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/dist/ric...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/lists/api/pom.xml =================================================================== --- trunk/ui/iteration/lists/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/lists/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -103,8 +103,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/lis...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/lists...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/lists/api</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/iteration/lists/pom.xml =================================================================== --- trunk/ui/iteration/lists/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/lists/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/lists</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/lists</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/lists</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/lists/ui/pom.xml =================================================================== --- trunk/ui/iteration/lists/ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/lists/ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -128,8 +128,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/lis...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/lists/ui</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/lists/ui</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/parent/pom.xml =================================================================== --- trunk/ui/iteration/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -173,8 +173,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/parent</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/ui/iteration/pom.xml =================================================================== --- trunk/ui/iteration/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -73,8 +73,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/tables/api/pom.xml =================================================================== --- trunk/ui/iteration/tables/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/tables/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -103,8 +103,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tab...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/table...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/tables/api</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/iteration/tables/impl/pom.xml =================================================================== --- trunk/ui/iteration/tables/impl/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/tables/impl/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -120,8 +120,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tab...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/table...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/tables/impl</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/iteration/tables/pom.xml =================================================================== --- trunk/ui/iteration/tables/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/tables/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -42,8 +42,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tables</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/tables</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/tables</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/iteration/tables/ui/pom.xml =================================================================== --- trunk/ui/iteration/tables/ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/iteration/tables/ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -128,8 +128,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tab...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/table...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/tables/ui</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/misc/bom/pom.xml =================================================================== --- trunk/ui/misc/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -81,8 +81,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/bom</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/bom</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/ui/misc/componentcontrol/pom.xml =================================================================== --- trunk/ui/misc/componentcontrol/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/componentcontrol/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -126,8 +126,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/compo...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/componen...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/componentc...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/componentcontrol</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/misc/dist/pom.xml =================================================================== --- trunk/ui/misc/dist/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/dist/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -51,8 +51,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/dist</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/misc/dist/richfaces-ui-misc-ui/pom.xml =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -205,8 +205,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist/ric...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richf...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richface...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/misc/functions/pom.xml =================================================================== --- trunk/ui/misc/functions/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/functions/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -120,8 +120,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/funct...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/functions</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/functions</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/functions</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/misc/jquery/pom.xml =================================================================== --- trunk/ui/misc/jquery/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/jquery/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -120,8 +120,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/jquery</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/jquery</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/jquery</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/jquery</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/misc/parent/pom.xml =================================================================== --- trunk/ui/misc/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -117,8 +117,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/parent</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: trunk/ui/misc/pom.xml =================================================================== --- trunk/ui/misc/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/misc/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -90,8 +90,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> Modified: trunk/ui/output/bom/pom.xml =================================================================== --- trunk/ui/output/bom/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/bom/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -72,8 +72,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/bom</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/bom</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/ui/output/dist/pom.xml =================================================================== --- trunk/ui/output/dist/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/dist/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -53,8 +53,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/dist</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/dist</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/dist</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/ui/output/dist/richfaces-ui-output-api/pom.xml =================================================================== --- trunk/ui/output/dist/richfaces-ui-output-api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/dist/richfaces-ui-output-api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -152,8 +152,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/dis...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/dist/r...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/dist/ric...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/dist/richfa...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/output/dist/richfaces-ui-output-ui/pom.xml =================================================================== --- trunk/ui/output/dist/richfaces-ui-output-ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/dist/richfaces-ui-output-ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -212,8 +212,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/dis...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/dist/r...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/dist/ric...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/dist/richfa...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/output/panels/api/pom.xml =================================================================== --- trunk/ui/output/panels/api/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/panels/api/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -103,8 +103,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/pan...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/panels...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/panels/api</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/panels/api</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/output/panels/pom.xml =================================================================== --- trunk/ui/output/panels/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/panels/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/panels</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/panels</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/panels</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/panels</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/output/panels/ui/pom.xml =================================================================== --- trunk/ui/output/panels/ui/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/panels/ui/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -133,8 +133,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/pan...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/panels/ui</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/panels/ui</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/panels/ui</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> Modified: trunk/ui/output/parent/pom.xml =================================================================== --- trunk/ui/output/parent/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/parent/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -173,8 +173,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output/parent</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: trunk/ui/output/pom.xml =================================================================== --- trunk/ui/output/pom.xml 2010-08-02 22:45:15 UTC (rev 18328) +++ trunk/ui/output/pom.xml 2010-08-02 23:13:11 UTC (rev 18329) @@ -71,8 +71,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/output/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/output/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/output</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/output</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> \ No newline at end of file

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18328 - trunk and 1 other directory.

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

Author: alexsmirnov Date: 2010-08-02 18:45:15 -0400 (Mon, 02 Aug 2010) New Revision: 18328 Added: root/tests/ Removed: trunk/tests/ Log: move tests from trunk Copied: root/tests (from rev 18327, trunk/tests)

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18327 - root and 1 other directory.

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

Author: alexsmirnov Date: 2010-08-02 18:43:42 -0400 (Mon, 02 Aug 2010) New Revision: 18327 Added: trunk/ Removed: root/trunk/ Log: move trunk from root Copied: trunk (from rev 18326, root/trunk)

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18326 - /.

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

Author: alexsmirnov Date: 2010-08-02 18:42:50 -0400 (Mon, 02 Aug 2010) New Revision: 18326 Removed: trunk/ Log: prepare to move trunk from root

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18325 - in root/trunk/core: api/src/main/java/org/richfaces/skin and 6 other directories.

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

Author: nbelaevski Date: 2010-08-02 15:36:31 -0400 (Mon, 02 Aug 2010) New Revision: 18325 Added: root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodecData.java root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java root/trunk/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java Modified: root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodec.java root/trunk/core/api/src/main/java/org/richfaces/skin/SkinFactory.java root/trunk/core/impl/src/main/java/org/richfaces/VersionBean.java root/trunk/core/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java root/trunk/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java root/trunk/core/impl/src/main/java/org/richfaces/skin/AbstractSkinFactory.java root/trunk/core/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java root/trunk/core/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java root/trunk/core/impl/src/test/java/org/richfaces/resource/StateHolderResourceImpl.java Log: ResourceHandler -> ResourceFactory separation refactoring Modified: root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodec.java =================================================================== --- root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodec.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodec.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -16,13 +16,5 @@ public String encodeJSFMapping(FacesContext context, String resourcePath); - public String decodeResourceName(FacesContext context, String requestPath); - - public String decodeLibraryName(FacesContext context, String requestPath); - - public Object decodeResourceData(FacesContext context, String requestPath); - - public String decodeResourceVersion(FacesContext context, String requestPath); - - public String getResourceKey(FacesContext context, String requestPath); + public ResourceCodecData decodeResource(FacesContext context, String requestPath); } Added: root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodecData.java =================================================================== --- root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodecData.java (rev 0) +++ root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceCodecData.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +/** + * @author Nick Belaevski + * + */ +public interface ResourceCodecData { + + public String getResourceName(); + + public String getLibraryName(); + + public String getVersion(); + + public Object getData(); + + public String getResourceKey(); +} Added: root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java =================================================================== --- root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java (rev 0) +++ root/trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import javax.faces.application.Resource; +import javax.faces.context.FacesContext; + +/** + * @author Nick Belaevski + * + */ +public interface ResourceFactory { + + public abstract Resource createResource(String resourceName, String libraryName, String contentType); + + public abstract Resource createResource(FacesContext context, ResourceCodecData resourceData); + +} Modified: root/trunk/core/api/src/main/java/org/richfaces/skin/SkinFactory.java =================================================================== --- root/trunk/core/api/src/main/java/org/richfaces/skin/SkinFactory.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/api/src/main/java/org/richfaces/skin/SkinFactory.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -85,5 +85,5 @@ public abstract Theme getTheme(FacesContext facesContext, String name); public abstract Skin getSkin(FacesContext context, String name); - + } Modified: root/trunk/core/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -111,7 +111,7 @@ private void initializeDerivativeProperties() { fullVersionString = MessageFormat.format("v.{0} SVN r.{1}", implementationVersion, scmRevision); - resourceVersion = implementationVersion.replace('.', '_') + "_" + scmRevision; + resourceVersion = implementationVersion.replace('.', '_'); } private Manifest readManifest() { Modified: root/trunk/core/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -36,12 +36,14 @@ import javax.faces.context.FacesContext; +import org.richfaces.VersionBean; import org.richfaces.renderkit.html.images.GradientType; import org.richfaces.renderkit.html.images.GradientType.BiColor; import org.richfaces.resource.DynamicResource; import org.richfaces.resource.ImageType; import org.richfaces.resource.Java2DUserResource; import org.richfaces.resource.StateHolderResource; +import org.richfaces.resource.VersionedResource; import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; @@ -50,7 +52,7 @@ * created 02.02.2007 */ @DynamicResource -public class BaseGradient implements Java2DUserResource, StateHolderResource { +public class BaseGradient implements Java2DUserResource, StateHolderResource, VersionedResource { protected Integer headerBackgroundColor; protected Integer headerGradientColor; @@ -241,6 +243,7 @@ } public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + //TODO move this call to another place in this and alike resources initialize(); dataOutput.writeInt(this.headerBackgroundColor); @@ -264,4 +267,8 @@ return false; } + public String getVersion() { + return VersionBean.VERSION.getResourceVersion(); + } + } Modified: root/trunk/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -161,9 +161,9 @@ String resourceVersion = getResourceVersion(); String resourceUri = resourceCodec.encodeResourceRequestPath(context, libraryName, resourceName, resourceData, resourceVersion); + + resourceUri = resourceCodec.encodeJSFMapping(context, resourceUri); - resourceUri = Util.encodeJSFURL(context, resourceUri); - if (LOGGER.isDebugEnabled()) { LOGGER.debug(MessageFormat.format("Request path for {0} resource is: {1}", String.valueOf(resourceName), String.valueOf(resourceUri))); Modified: root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -29,46 +29,22 @@ public final class DefaultResourceCodec implements ResourceCodec { - private static final String RESOURCE_VERSION_PARAM = "v"; + private static final String VERSION_PARAM = "v"; - private static final String RESOURCE_DATA_BYTES_ARRAY_PARAM = "db"; + private static final String DATA_BYTES_ARRAY_PARAM = "db"; - private static final String RESOURCE_DATA_OBJECT_PARAM = "do"; + private static final String DATA_OBJECT_PARAM = "do"; private static final String LIBRARY_NAME_PARAM = "ln"; - public String decodeResourceName(FacesContext context, String requestPath) { - return requestPath; + String encodeResource(DefaultResourceCodecData data) { + return encodeResource(data.getLibraryName(), data.getResourceName(), data.getDataString(), + data.isDataSerialized(), data.getVersion()); } - - public String decodeLibraryName(FacesContext context, String requestPath) { - Map<String, String> paramMap = context.getExternalContext().getRequestParameterMap(); - return paramMap.get(LIBRARY_NAME_PARAM); - } - public Object decodeResourceData(FacesContext context, String requestPath) { - Map<String, String> paramMap = context.getExternalContext().getRequestParameterMap(); + String encodeResource(String libraryName, String resourceName, + String encodedResourceData, boolean dataIsSerialized, String resourceVersion) { - String encodedData = paramMap.get(RESOURCE_DATA_BYTES_ARRAY_PARAM); - if (encodedData != null) { - return Util.decodeBytesData(encodedData); - } else { - encodedData = paramMap.get(RESOURCE_DATA_OBJECT_PARAM); - if (encodedData != null) { - return Util.decodeObjectData(encodedData); - } - } - - return null; - } - - public String decodeResourceVersion(FacesContext context, String requestPath) { - return context.getExternalContext().getRequestParameterMap().get(RESOURCE_VERSION_PARAM); - } - - private String encodeResource(FacesContext context, String libraryName, String resourceName, - String encodedResourceData, boolean dataIsBytesArray, String resourceVersion) { - boolean parameterAppended = false; StringBuilder sb = new StringBuilder(); @@ -80,7 +56,7 @@ parameterAppended = true; } - sb.append(RESOURCE_VERSION_PARAM); + sb.append(VERSION_PARAM); sb.append('='); sb.append(Util.encodeURIQueryPart(resourceVersion)); } @@ -93,7 +69,7 @@ sb.append('&'); } - sb.append(dataIsBytesArray ? RESOURCE_DATA_BYTES_ARRAY_PARAM : RESOURCE_DATA_OBJECT_PARAM); + sb.append(dataIsSerialized ? DATA_OBJECT_PARAM : DATA_BYTES_ARRAY_PARAM); sb.append('='); sb.append(Util.encodeURIQueryPart(encodedResourceData)); } @@ -116,38 +92,38 @@ public String encodeResourceRequestPath(FacesContext context, String libraryName, String resourceName, Object resourceData, String resourceVersion) { String encodedDataString = null; - boolean isBytesArray = false; + boolean dataIsSerialized = false; if (resourceData != null) { if (resourceData instanceof byte[]) { - isBytesArray = true; encodedDataString = Util.encodeBytesData((byte[]) resourceData); } else { encodedDataString = Util.encodeObjectData(resourceData); + dataIsSerialized = true; } } return ResourceHandlerImpl.RICHFACES_RESOURCE_IDENTIFIER - + encodeResource(context, libraryName, resourceName, encodedDataString, isBytesArray, resourceVersion); + + encodeResource(libraryName, resourceName, encodedDataString, dataIsSerialized, resourceVersion); } public String encodeJSFMapping(FacesContext context, String resourcePath) { return Util.encodeJSFURL(context, resourcePath); } - public String getResourceKey(FacesContext context, String requestPath) { - Map<String, String> paramMap = context.getExternalContext().getRequestParameterMap(); - - boolean isBytesArray = true; - String resourceDataString = paramMap.get(RESOURCE_DATA_BYTES_ARRAY_PARAM); - if (resourceDataString == null) { - resourceDataString = paramMap.get(RESOURCE_DATA_OBJECT_PARAM); - isBytesArray = false; + public ResourceCodecData decodeResource(FacesContext context, String requestPath) { + Map<String, String> params = context.getExternalContext().getRequestParameterMap(); + DefaultResourceCodecData data = new DefaultResourceCodecData(this); + data.setResourceName(requestPath); + data.setLibraryName(params.get(LIBRARY_NAME_PARAM)); + data.setVersion(params.get(VERSION_PARAM)); + + String objectDataString = params.get(DATA_OBJECT_PARAM); + if (objectDataString != null) { + data.setDataString(objectDataString); + data.setDataSerialized(true); + } else { + data.setDataString(params.get(DATA_BYTES_ARRAY_PARAM)); } - - String resourceVersionString = paramMap.get(RESOURCE_VERSION_PARAM); - - return encodeResource(context, decodeLibraryName(context, requestPath), - decodeResourceName(context, requestPath), - resourceDataString, isBytesArray, resourceVersionString); + return data; } } Added: root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java (rev 0) +++ root/trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -0,0 +1,113 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import org.richfaces.util.Util; + +/** + * @author Nick Belaevski + * + */ +final class DefaultResourceCodecData implements ResourceCodecData { + + private DefaultResourceCodec defaultResourceCodec; + + public DefaultResourceCodecData(DefaultResourceCodec defaultResourceCodec) { + super(); + this.defaultResourceCodec = defaultResourceCodec; + } + + private String resourceName; + + private String libraryName; + + private String version; + + private String dataString; + + private boolean dataSerialized; + + //lazy evaluated + private String resourceKey = null; + + //lazy evaluated + private Object data = null; + + protected void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public String getResourceName() { + return resourceName; + } + + protected void setLibraryName(String libraryName) { + this.libraryName = libraryName; + } + + public String getLibraryName() { + return libraryName; + } + + protected void setVersion(String version) { + this.version = version; + } + + public String getVersion() { + return version; + } + + public String getResourceKey() { + if (resourceKey == null) { + resourceKey = defaultResourceCodec.encodeResource(this); + } + return resourceKey; + } + + protected String getDataString() { + return dataString; + } + + protected void setDataString(String dataString) { + this.dataString = dataString; + } + + protected void setDataSerialized(boolean dataSerialized) { + this.dataSerialized = dataSerialized; + } + + protected boolean isDataSerialized() { + return dataSerialized; + } + + public Object getData() { + if (data == null && dataString != null) { + if (isDataSerialized()) { + data = Util.decodeObjectData(dataString); + } else { + data = Util.decodeBytesData(dataString); + } + } + + return data; + } +} Added: root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java (rev 0) +++ root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -0,0 +1,295 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import java.net.URL; +import java.text.MessageFormat; +import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Properties; +import java.util.Set; + +import javax.faces.application.Resource; +import javax.faces.application.ResourceHandler; +import javax.faces.context.FacesContext; + +import org.richfaces.application.DependencyInjector; +import org.richfaces.application.ServiceTracker; +import org.richfaces.skin.SkinFactory; +import org.richfaces.util.PropertiesUtil; +import org.richfaces.util.Util; + +import com.google.common.collect.Maps; + +/** + * @author Nick Belaevski + * + */ +public class ResourceFactoryImpl implements ResourceFactory { + + private static final String SKINNED_RESOURCE_PREFIX = "%skin%/"; + + private static final ResourceLogger LOGGER = ResourceLogger.INSTANCE; + + private static class ResourceLocator { + + private String resourcePath; + + public ResourceLocator(String resourcePath) { + super(); + this.resourcePath = resourcePath; + } + + public String locateResource(FacesContext facesContext) { + return resourcePath; + } + + } + + private static final class SkinResourceLocator extends ResourceLocator { + + public SkinResourceLocator(String resourcePath) { + super(resourcePath); + } + + @Override + public String locateResource(FacesContext facesContext) { + SkinFactory skinFactory = SkinFactory.getInstance(facesContext); + + String skinName = skinFactory.getSkin(facesContext).getName(); + return skinName + '/' + super.locateResource(facesContext); + } + } + + private ResourceHandler defaultHandler; + + private Map<String, ResourceLocator> resourceLocatorsMap; + + public ResourceFactoryImpl(ResourceHandler defaultHandler) { + super(); + this.defaultHandler = defaultHandler; + + initializeResourceLocatorsMap(); + } + + private void initializeResourceLocatorsMap() { + resourceLocatorsMap = Maps.newHashMap(); + + Properties properties = new Properties(); + PropertiesUtil.loadProperties(properties, "META-INF/resources/org.richfaces/resource-mappings.properties"); + + Set<Entry<Object, Object>> entries = properties.entrySet(); + for (Entry<Object, Object> entry : entries) { + String resourceKey = (String) entry.getKey(); + + ResourceLocator resourceLocator; + String resourcePath = (String) entry.getValue(); + if (resourcePath.startsWith(SKINNED_RESOURCE_PREFIX)) { + resourceLocator = new SkinResourceLocator(resourcePath.substring(SKINNED_RESOURCE_PREFIX.length())); + } else { + resourceLocator = new ResourceLocator(resourcePath); + } + + resourceLocatorsMap.put(resourceKey, resourceLocator); + } + + resourceLocatorsMap = Collections.unmodifiableMap(resourceLocatorsMap); + } + + private String extractParametersFromResourceName(String resourceName) { + if (!(resourceName.lastIndexOf("?") != -1)) { + return resourceName; + } + return resourceName.substring(0, resourceName.lastIndexOf("?")); + } + + private Resource createCompiledCSSResource(String resourceName, String libraryName) { + Resource sourceResource = defaultHandler.createResource(resourceName, libraryName, "text/plain"); + if (sourceResource != null) { + return new CompiledCSSResource(sourceResource); + } + + return null; + } + + protected void injectProperties(Object resource, Map<String, String> parameters) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + + Map<Object, Object> attributes = facesContext.getAttributes(); + try { + attributes.put(ResourceParameterELResolver.CONTEXT_ATTRIBUTE_NAME, parameters); + ServiceTracker.getService(DependencyInjector.class).inject(facesContext,resource); + } finally { + attributes.remove(ResourceParameterELResolver.CONTEXT_ATTRIBUTE_NAME); + } + } + + /** + * Should be called only if {@link #isResourceExists(String)} returns <code>true</code> + * + * @param resourceName + * @return + */ + protected Resource createHandlerDependentResource(String resourceName, Map<String, String> parameters) { + Resource resource = null; + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + + if (contextClassLoader != null) { + try { + Class<?> loadedClass = Class.forName(resourceName, false, contextClassLoader); + + boolean legitimateResource = false; + + DynamicResource annotation = loadedClass.getAnnotation(DynamicResource.class); + legitimateResource = (annotation != null); + if (legitimateResource) { + LOGGER.debug( + MessageFormat.format("Dynamic resource annotation is present on resource class {0}", resourceName)); + } else { + LOGGER.debug( + MessageFormat.format("Dynamic resource annotation is not present on resource class {0}", resourceName)); + } + + if (!legitimateResource) { + // TODO resource marker extension name? + URL resourceMarkerUrl = contextClassLoader.getResource("META-INF/" + resourceName + ".resource.properties"); + + legitimateResource = resourceMarkerUrl != null; + + if (LOGGER.isDebugEnabled()) { + if (legitimateResource) { + LOGGER.debug( + MessageFormat.format("Marker file for {0} resource found in classpath", resourceName)); + } else { + LOGGER.debug( + MessageFormat.format("Marker file for {0} resource does not exist", resourceName)); + } + } + } + + if (legitimateResource) { + Object wrappedResource; + if (Java2DUserResource.class.isAssignableFrom(loadedClass)) { + Java2DUserResource java2DUserResource = (Java2DUserResource) loadedClass.newInstance(); + wrappedResource = java2DUserResource; + resource = new Java2DUserResourceWrapperImpl(java2DUserResource); + } else if (UserResource.class.isAssignableFrom(loadedClass)) { + UserResource userResource = (UserResource) loadedClass.newInstance(); + wrappedResource = userResource; + resource = new UserResourceWrapperImpl(userResource); + } else { + Class<? extends Resource> resourceClass = loadedClass.asSubclass(Resource.class); + resource = (Resource) resourceClass.newInstance(); + wrappedResource = resource; + } + + if (parameters != null) { + injectProperties(wrappedResource, parameters); + } + + resource.setResourceName(resourceName); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(MessageFormat.format("Successfully created instance of {0} resource", + resourceName)); + } + } + } catch (ClassNotFoundException e) { + //do nothing + } catch (Exception e) { + LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", resourceName); + } catch (LinkageError e) { + LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", resourceName); + } + } + + return resource; + } + + public Resource createResource(FacesContext context, ResourceCodecData resourceData) { + String resourceName = resourceData.getResourceName(); + + if ((resourceName == null) || (resourceName.length() == 0)) { + return null; + } + + String libraryName = resourceData.getLibraryName(); + Resource resource = createResource(resourceName, libraryName, null); + + if (resource == null) { + LOGGER.logMissingResource(context, resourceData.getResourceKey()); + return null; + } + + if (resource instanceof VersionedResource) { + VersionedResource versionedResource = (VersionedResource) resource; + String existingVersion = versionedResource.getVersion(); + String requestedVersion = resourceData.getVersion(); + + if (LOGGER.isDebugEnabled()) { + LOGGER.debug( + MessageFormat.format( + "Client requested {0} version of resource, server has {1} version", + String.valueOf(requestedVersion), String.valueOf(existingVersion))); + } + + if ((existingVersion != null) && (requestedVersion != null) + && !existingVersion.equals(requestedVersion)) { + LOGGER.logResourceProblem(context, null, "Resource {0} of version {1} was not found", resourceName, + requestedVersion); + return null; + } + } + + Object decodedData = resourceData.getData(); + + if (LOGGER.isDebugEnabled()) { + if (decodedData != null) { + LOGGER.debug("Resource state data succesfully decoded"); + } else { + LOGGER.debug("Resource state data decoded as null"); + } + } + + Util.restoreResourceState(context, resource, decodedData); + + return resource; + } + + public Resource createResource(String resourceName, String libraryName, String contentType) { + Resource result = null; + Map<String, String> params = Util.parseResourceParameters(resourceName); + resourceName = extractParametersFromResourceName(resourceName); + if (resourceName.endsWith(".ecss")) { + //TODO nick - params? + result = createCompiledCSSResource(resourceName, libraryName); + } else { + //TODO nick - libraryName as package name? + if ((resourceName != null) && ((libraryName == null) || (libraryName.length() == 0))) { + result = createHandlerDependentResource(resourceName, params); + } + } + + return result; + } + +} Modified: root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -24,14 +24,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URL; import java.text.MessageFormat; import java.util.Date; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import javax.faces.application.ProjectStage; import javax.faces.application.Resource; import javax.faces.application.ResourceHandler; import javax.faces.application.ResourceHandlerWrapper; @@ -42,24 +40,24 @@ import javax.servlet.http.HttpServletResponse; import org.ajax4jsf.cache.Cache; -import org.richfaces.application.DependencyInjector; import org.richfaces.application.ServiceTracker; -import org.richfaces.log.RichfacesLogger; import org.richfaces.util.RequestStateManager.BooleanRequestStateVariable; import org.richfaces.util.Util; -import org.slf4j.Logger; /** * @author Nick Belaevski * @since 4.0 */ +//TODO extract caching public class ResourceHandlerImpl extends ResourceHandlerWrapper { public static final String RICHFACES_RESOURCE_IDENTIFIER = "/rfRes/"; public static final String RESOURCE_CACHE_NAME = "org.richfaces.ResourcesCache"; public static final String HANDLER_START_TIME_ATTRIBUTE = ResourceHandlerImpl.class.getName() + ":StartTime"; - private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger(); + private static final ResourceLogger LOGGER = ResourceLogger.INSTANCE; + private ResourceFactory resourceFactory; + // TODO - review - do we need this? static { @@ -72,6 +70,8 @@ thread.setContextClassLoader(systemCL); ImageIO.setUseCache(false); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); } finally { thread.setContextClassLoader(initialTCCL); } @@ -81,7 +81,8 @@ public ResourceHandlerImpl(ResourceHandler defaultHandler) { this.defaultHandler = defaultHandler; - + this.resourceFactory = new ResourceFactoryImpl(defaultHandler); + if (LOGGER.isDebugEnabled()) { LOGGER.debug(MessageFormat.format("Instance of {0} resource handler created", getClass().getName())); } @@ -148,42 +149,10 @@ context.getExternalContext().setResponseStatus(HttpServletResponse.SC_NOT_MODIFIED); } - private void logResourceProblem(FacesContext context, Throwable throwable, String messagePattern, - Object... arguments) { - boolean isProductionStage = context.isProjectStage(ProjectStage.Production); - - if (LOGGER.isWarnEnabled() || (!isProductionStage && LOGGER.isInfoEnabled())) { - String formattedMessage = MessageFormat.format(messagePattern, arguments); - - if (throwable != null) { - LOGGER.warn(formattedMessage, throwable); - } else { - if (isProductionStage) { - LOGGER.info(formattedMessage); - } else { - LOGGER.warn(formattedMessage); - } - } - } - } - - private void logMissingResource(FacesContext context, String resourceData) { - logResourceProblem(context, null, "Resource {0} was not found", resourceData); - } - private static void sendResourceNotFound(FacesContext context) { context.getExternalContext().setResponseStatus(HttpServletResponse.SC_NOT_FOUND); } - private Resource createCompiledCSSResource(String resourceName, String libraryName) { - Resource sourceResource = defaultHandler.createResource(resourceName, libraryName, "text/plain"); - if (sourceResource != null) { - return new CompiledCSSResource(sourceResource); - } - - return null; - } - @Override public void handleResourceRequest(FacesContext context) throws IOException { if (isThisHandlerResourceRequest(context)) { @@ -193,102 +162,49 @@ assert (resourcePath != null) && (resourcePath.length() != 0); - String resourceKey = resourceCodec.getResourceKey(context, resourcePath); + ResourceCodecData data = resourceCodec.decodeResource(context, resourcePath); + assert (data != null); - assert (resourceKey != null) && (resourceKey.length() != 0); - Cache cache = ServiceTracker.getService(context, Cache.class); - Resource resource = lookupInCache(cache, resourceKey); + Resource resource = lookupInCache(cache, data.getResourceKey()); if (resource == null) { - String resourceName = resourceCodec.decodeResourceName(context, resourcePath); + resource = resourceFactory.createResource(context, data); + } + + if (resource == null) { + sendResourceNotFound(context); + return; + } + + if (resource instanceof CacheableResource) { + CacheableResource cacheableResource = (CacheableResource) resource; - if ((resourceName == null) || (resourceName.length() == 0)) { - logMissingResource(context, resourceKey); - sendResourceNotFound(context); + if (cacheableResource.isCacheable(context)) { - return; - } + // TODO - we could move this part of code to ConcurrentMap so that + // only single thread does resource put + CachedResourceImpl cachedResource = new CachedResourceImpl(); - if (resourceName.lastIndexOf(".ecss") != -1) { - String libraryName = resourceCodec.decodeLibraryName(context, resourcePath); - resource = createCompiledCSSResource(resourceName, libraryName); - } + cachedResource.initialize(resource); - if (resource == null) { - resource = createHandlerDependentResource(resourceName, null); - } + // someone may provided this resource for us + // while we were reading it, check once again + resource = lookupInCache(cache, data.getResourceKey()); - if (resource == null) { - logMissingResource(context, resourceName); - sendResourceNotFound(context); + if (resource == null) { + Date cacheExpirationDate = cachedResource.getExpired(context); - return; - } + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(new MessageFormat( + "Storing {0} resource in cache until {1,date,dd MMM yyyy HH:mm:ss zzz}", Locale.US). + format(new Object[]{data.getResourceKey(), cacheExpirationDate})); + } - if (resource instanceof VersionedResource) { - VersionedResource versionedResource = (VersionedResource) resource; - String existingVersion = versionedResource.getVersion(); - String requestedVersion = resourceCodec.decodeResourceVersion(context, resourcePath); - - if (LOGGER.isDebugEnabled()) { - LOGGER.debug( - MessageFormat.format( - "Client requested {0} version of resource, server has {1} version", - String.valueOf(requestedVersion), String.valueOf(existingVersion))); + cache.put(data.getResourceKey(), cachedResource, cacheExpirationDate); + resource = cachedResource; } - - if ((existingVersion != null) && (requestedVersion != null) - && !existingVersion.equals(requestedVersion)) { - logResourceProblem(context, null, "Resource {0} of version {1} was not found", resourceName, - requestedVersion); - sendResourceNotFound(context); - - return; - } } - - Object decodedData = resourceCodec.decodeResourceData(context, resourcePath); - - if (LOGGER.isDebugEnabled()) { - if (decodedData != null) { - LOGGER.debug("Resource state data succesfully decoded"); - } else { - LOGGER.debug("Resource state data decoded as null"); - } - } - - Util.restoreResourceState(context, resource, decodedData); - - if (resource instanceof AbstractCacheableResource) { - AbstractCacheableResource cacheableResource = (AbstractCacheableResource) resource; - - if (cacheableResource.isCacheable(context)) { - - // TODO - we could move this part of code to ConcurrentMap so that - // only single thread does resource put - CachedResourceImpl cachedResource = new CachedResourceImpl(); - - cachedResource.initialize(resource); - - // someone may provided this resource for us - // while we were reading it, check once again - resource = lookupInCache(cache, resourceKey); - - if (resource == null) { - Date cacheExpirationDate = cachedResource.getExpired(context); - - if (LOGGER.isDebugEnabled()) { - LOGGER.debug(new MessageFormat( - "Storing {0} resource in cache until {1,date,dd MMM yyyy HH:mm:ss zzz}", Locale.US). - format(new Object[]{resourceKey, cacheExpirationDate})); - } - - cache.put(resourceKey, cachedResource, cacheExpirationDate); - resource = cachedResource; - } - } - } } if (resource.userAgentNeedsUpdate(context)) { @@ -366,127 +282,16 @@ } } - protected void injectProperties(Object resource, Map<String, String> parameters) { - FacesContext facesContext = FacesContext.getCurrentInstance(); - - Map<Object, Object> attributes = facesContext.getAttributes(); - try { - attributes.put(ResourceParameterELResolver.CONTEXT_ATTRIBUTE_NAME, parameters); - ServiceTracker.getService(DependencyInjector.class).inject(facesContext,resource); - } finally { - attributes.remove(ResourceParameterELResolver.CONTEXT_ATTRIBUTE_NAME); - } - } - - /** - * Should be called only if {@link #isResourceExists(String)} returns <code>true</code> - * - * @param resourceName - * @return - */ - protected Resource createHandlerDependentResource(String resourceName, Map<String, String> parameters) { - Resource resource = null; - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - - if (contextClassLoader != null) { - try { - Class<?> loadedClass = Class.forName(resourceName, false, contextClassLoader); - - boolean legitimateResource = false; - - DynamicResource annotation = loadedClass.getAnnotation(DynamicResource.class); - legitimateResource = (annotation != null); - if (legitimateResource) { - LOGGER.debug( - MessageFormat.format("Dynamic resource annotation is present on resource class {0}", resourceName)); - } else { - LOGGER.debug( - MessageFormat.format("Dynamic resource annotation is not present on resource class {0}", resourceName)); - } - - if (!legitimateResource) { - // TODO resource marker extension name? - URL resourceMarkerUrl = contextClassLoader.getResource("META-INF/" + resourceName + ".resource.properties"); - - legitimateResource = resourceMarkerUrl != null; - - if (LOGGER.isDebugEnabled()) { - if (legitimateResource) { - LOGGER.debug( - MessageFormat.format("Marker file for {0} resource found in classpath", resourceName)); - } else { - LOGGER.debug( - MessageFormat.format("Marker file for {0} resource does not exist", resourceName)); - } - } - } - - if (legitimateResource) { - Object wrappedResource; - if (Java2DUserResource.class.isAssignableFrom(loadedClass)) { - Java2DUserResource java2DUserResource = (Java2DUserResource) loadedClass.newInstance(); - wrappedResource = java2DUserResource; - resource = new Java2DUserResourceWrapperImpl(java2DUserResource); - } else if (UserResource.class.isAssignableFrom(loadedClass)) { - UserResource userResource = (UserResource) loadedClass.newInstance(); - wrappedResource = userResource; - resource = new UserResourceWrapperImpl(userResource); - } else { - Class<? extends Resource> resourceClass = loadedClass.asSubclass(Resource.class); - resource = (Resource) resourceClass.newInstance(); - wrappedResource = resource; - } - - if (parameters != null) { - injectProperties(wrappedResource, parameters); - } - - resource.setResourceName(resourceName); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug(MessageFormat.format("Successfully created instance of {0} resource", - resourceName)); - } - } - } catch (ClassNotFoundException e) { - //do nothing - } catch (Exception e) { - logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", resourceName); - } catch (LinkageError e) { - logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", resourceName); - } - } - - return resource; - } - @Override public Resource createResource(String resourceName, String libraryName, String contentType) { - Resource result = null; - Map<String, String> params = Util.parseResourceParameters(resourceName); - resourceName = extractParametersFromResourceName(resourceName); - if (resourceName.lastIndexOf(".ecss") != -1) { - //TODO nick - params? - result = createCompiledCSSResource(resourceName, libraryName); - } else { - //TODO nick - libraryName as package name? - if ((resourceName != null) && ((libraryName == null) || (libraryName.length() == 0))) { - result = createHandlerDependentResource(resourceName, params); - } + Resource resource = resourceFactory.createResource(resourceName, libraryName, contentType); + if (resource == null) { + resource = defaultHandler.createResource(resourceName, libraryName, contentType); } - if (result == null) { - result = defaultHandler.createResource(resourceName, libraryName, contentType); - } - - return result; + + return resource; } - private String extractParametersFromResourceName(String resourceName) { - if (!(resourceName.lastIndexOf("?") != -1)) { - return resourceName; - } - return resourceName.substring(0, resourceName.lastIndexOf("?")); - } - @Override public Resource createResource(String resourceName, String libraryName) { return createResource(resourceName, libraryName, null); Added: root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java (rev 0) +++ root/trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -0,0 +1,313 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import java.text.MessageFormat; + +import javax.faces.application.ProjectStage; +import javax.faces.context.FacesContext; + +import org.richfaces.log.RichfacesLogger; +import org.slf4j.Logger; +import org.slf4j.Marker; + +/** + * @author Nick Belaevski + * + */ +final class ResourceLogger implements Logger { + + static final ResourceLogger INSTANCE = new ResourceLogger(); + + private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger(); + + private ResourceLogger() {} + + void logResourceProblem(FacesContext context, Throwable throwable, String messagePattern, + Object... arguments) { + boolean isProductionStage = context.isProjectStage(ProjectStage.Production); + + if (LOGGER.isWarnEnabled() || (!isProductionStage && LOGGER.isInfoEnabled())) { + String formattedMessage = MessageFormat.format(messagePattern, arguments); + + if (throwable != null) { + LOGGER.warn(formattedMessage, throwable); + } else { + if (isProductionStage) { + LOGGER.info(formattedMessage); + } else { + LOGGER.warn(formattedMessage); + } + } + } + } + + void logMissingResource(FacesContext context, String resourceData) { + logResourceProblem(context, null, "Resource {0} was not found", resourceData); + } + + public String getName() { + return LOGGER.getName(); + } + + public boolean isTraceEnabled() { + return LOGGER.isTraceEnabled(); + } + + public void trace(String msg) { + LOGGER.trace(msg); + } + + public void trace(String format, Object arg) { + LOGGER.trace(format, arg); + } + + public void trace(String format, Object arg1, Object arg2) { + LOGGER.trace(format, arg1, arg2); + } + + public void trace(String format, Object[] argArray) { + LOGGER.trace(format, argArray); + } + + public void trace(String msg, Throwable t) { + LOGGER.trace(msg, t); + } + + public boolean isTraceEnabled(Marker marker) { + return LOGGER.isTraceEnabled(marker); + } + + public void trace(Marker marker, String msg) { + LOGGER.trace(marker, msg); + } + + public void trace(Marker marker, String format, Object arg) { + LOGGER.trace(marker, format, arg); + } + + public void trace(Marker marker, String format, Object arg1, Object arg2) { + LOGGER.trace(marker, format, arg1, arg2); + } + + public void trace(Marker marker, String format, Object[] argArray) { + LOGGER.trace(marker, format, argArray); + } + + public void trace(Marker marker, String msg, Throwable t) { + LOGGER.trace(marker, msg, t); + } + + public boolean isDebugEnabled() { + return LOGGER.isDebugEnabled(); + } + + public void debug(String msg) { + LOGGER.debug(msg); + } + + public void debug(String format, Object arg) { + LOGGER.debug(format, arg); + } + + public void debug(String format, Object arg1, Object arg2) { + LOGGER.debug(format, arg1, arg2); + } + + public void debug(String format, Object[] argArray) { + LOGGER.debug(format, argArray); + } + + public void debug(String msg, Throwable t) { + LOGGER.debug(msg, t); + } + + public boolean isDebugEnabled(Marker marker) { + return LOGGER.isDebugEnabled(marker); + } + + public void debug(Marker marker, String msg) { + LOGGER.debug(marker, msg); + } + + public void debug(Marker marker, String format, Object arg) { + LOGGER.debug(marker, format, arg); + } + + public void debug(Marker marker, String format, Object arg1, Object arg2) { + LOGGER.debug(marker, format, arg1, arg2); + } + + public void debug(Marker marker, String format, Object[] argArray) { + LOGGER.debug(marker, format, argArray); + } + + public void debug(Marker marker, String msg, Throwable t) { + LOGGER.debug(marker, msg, t); + } + + public boolean isInfoEnabled() { + return LOGGER.isInfoEnabled(); + } + + public void info(String msg) { + LOGGER.info(msg); + } + + public void info(String format, Object arg) { + LOGGER.info(format, arg); + } + + public void info(String format, Object arg1, Object arg2) { + LOGGER.info(format, arg1, arg2); + } + + public void info(String format, Object[] argArray) { + LOGGER.info(format, argArray); + } + + public void info(String msg, Throwable t) { + LOGGER.info(msg, t); + } + + public boolean isInfoEnabled(Marker marker) { + return LOGGER.isInfoEnabled(marker); + } + + public void info(Marker marker, String msg) { + LOGGER.info(marker, msg); + } + + public void info(Marker marker, String format, Object arg) { + LOGGER.info(marker, format, arg); + } + + public void info(Marker marker, String format, Object arg1, Object arg2) { + LOGGER.info(marker, format, arg1, arg2); + } + + public void info(Marker marker, String format, Object[] argArray) { + LOGGER.info(marker, format, argArray); + } + + public void info(Marker marker, String msg, Throwable t) { + LOGGER.info(marker, msg, t); + } + + public boolean isWarnEnabled() { + return LOGGER.isWarnEnabled(); + } + + public void warn(String msg) { + LOGGER.warn(msg); + } + + public void warn(String format, Object arg) { + LOGGER.warn(format, arg); + } + + public void warn(String format, Object[] argArray) { + LOGGER.warn(format, argArray); + } + + public void warn(String format, Object arg1, Object arg2) { + LOGGER.warn(format, arg1, arg2); + } + + public void warn(String msg, Throwable t) { + LOGGER.warn(msg, t); + } + + public boolean isWarnEnabled(Marker marker) { + return LOGGER.isWarnEnabled(marker); + } + + public void warn(Marker marker, String msg) { + LOGGER.warn(marker, msg); + } + + public void warn(Marker marker, String format, Object arg) { + LOGGER.warn(marker, format, arg); + } + + public void warn(Marker marker, String format, Object arg1, Object arg2) { + LOGGER.warn(marker, format, arg1, arg2); + } + + public void warn(Marker marker, String format, Object[] argArray) { + LOGGER.warn(marker, format, argArray); + } + + public void warn(Marker marker, String msg, Throwable t) { + LOGGER.warn(marker, msg, t); + } + + public boolean isErrorEnabled() { + return LOGGER.isErrorEnabled(); + } + + public void error(String msg) { + LOGGER.error(msg); + } + + public void error(String format, Object arg) { + LOGGER.error(format, arg); + } + + public void error(String format, Object arg1, Object arg2) { + LOGGER.error(format, arg1, arg2); + } + + public void error(String format, Object[] argArray) { + LOGGER.error(format, argArray); + } + + public void error(String msg, Throwable t) { + LOGGER.error(msg, t); + } + + public boolean isErrorEnabled(Marker marker) { + return LOGGER.isErrorEnabled(marker); + } + + public void error(Marker marker, String msg) { + LOGGER.error(marker, msg); + } + + public void error(Marker marker, String format, Object arg) { + LOGGER.error(marker, format, arg); + } + + public void error(Marker marker, String format, Object arg1, Object arg2) { + LOGGER.error(marker, format, arg1, arg2); + } + + public void error(Marker marker, String format, Object[] argArray) { + LOGGER.error(marker, format, argArray); + } + + public void error(Marker marker, String msg, Throwable t) { + LOGGER.error(marker, msg, t); + } + + +} Modified: root/trunk/core/impl/src/main/java/org/richfaces/skin/AbstractSkinFactory.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/skin/AbstractSkinFactory.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/main/java/org/richfaces/skin/AbstractSkinFactory.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -21,10 +21,6 @@ */ package org.richfaces.skin; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Enumeration; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; @@ -40,10 +36,8 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.Messages; -import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.util.ELUtils; -import org.richfaces.log.RichfacesLogger; -import org.slf4j.Logger; +import org.richfaces.util.PropertiesUtil; /** * @author Nick Belaevski @@ -80,7 +74,6 @@ * user-defined. */ private static final String[] SKINS_PATHS = {DEFAULT_SKIN_PATH, USER_SKIN_PATH}; - private static final Logger LOG = RichfacesLogger.APPLICATION.getLogger(); private ConcurrentMap<String, FutureTask<Skin>> skins = new ConcurrentHashMap<String, FutureTask<Skin>>(); @@ -134,8 +127,6 @@ * @throws SkinNotFoundException */ protected Properties loadProperties(String name, String[] paths) throws SkinNotFoundException { - ClassLoader loader = getClassLoader(); - // Get properties for concrete skin. Properties skinProperties = new Properties(); int loadedPropertiesCount = 0; @@ -143,7 +134,7 @@ for (int i = 0; i < paths.length; i++) { String skinPropertiesLocation = paths[i].replaceAll("%s", name); - if (loadProperties(loader, skinProperties, skinPropertiesLocation)) { + if (PropertiesUtil.loadProperties(skinProperties, skinPropertiesLocation)) { loadedPropertiesCount++; } } @@ -155,54 +146,6 @@ return skinProperties; } - /** - * @param loader - * @param properties - * @param location - */ - protected boolean loadProperties(ClassLoader loader, Properties properties, String location) { - boolean loaded = false; - - try { - Enumeration<URL> resources = loader.getResources(location); - - while (resources.hasMoreElements()) { - URL url = (URL) resources.nextElement(); - InputStream propertyStream = null; - - try { - propertyStream = URLToStreamHelper.urlToStream(url); - properties.load(propertyStream); - loaded = true; - } catch (IOException e) { - LOG.warn(Messages.getMessage(Messages.SKIN_PROPERTIES_IO_ERROR), e); - - continue; - } finally { - if (null != propertyStream) { - propertyStream.close(); - } - } - } - } catch (IOException e) { - - // Do nothing - we can only log error, and continue to load next - // property. - if (LOG.isInfoEnabled()) { - LOG.info(Messages.getMessage(Messages.SKIN_PROPERTIES_IO_ERROR), e); - } - } - - return loaded; - } - - /** - * @return - */ - protected ClassLoader getClassLoader() { - return Thread.currentThread().getContextClassLoader(); - } - @Override public Skin getSkin(FacesContext context, String name) { if (null == name) { Added: root/trunk/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java =================================================================== --- root/trunk/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java (rev 0) +++ root/trunk/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.util; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.text.MessageFormat; +import java.util.Enumeration; +import java.util.Properties; + +import org.ajax4jsf.resource.util.URLToStreamHelper; +import org.richfaces.log.RichfacesLogger; +import org.slf4j.Logger; + +/** + * @author Nick Belaevski + * + */ +public final class PropertiesUtil { + + private static final Logger LOGGER = RichfacesLogger.UTIL.getLogger(); + + private PropertiesUtil() { + } + + private static ClassLoader getClassLoader() { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + if (classLoader == null) { + classLoader = PropertiesUtil.class.getClassLoader(); + } + + return classLoader; + } + + public static boolean loadProperties(Properties properties, String location) { + boolean loaded = false; + + try { + Enumeration<URL> resources = getClassLoader().getResources(location); + + while (resources.hasMoreElements()) { + URL url = (URL) resources.nextElement(); + InputStream propertyStream = null; + + try { + propertyStream = URLToStreamHelper.urlToStream(url); + properties.load(propertyStream); + loaded = true; + } catch (IOException e) { + LOGGER.warn(MessageFormat.format("Failure loading properties from URL: {0}", url.toExternalForm()), e); + + continue; + } finally { + if (null != propertyStream) { + propertyStream.close(); + } + } + } + } catch (IOException e) { + + // Do nothing - we can only log error, and continue to load next + // property. + if (LOGGER.isInfoEnabled()) { + LOGGER.warn(MessageFormat.format("Failure loading properties from location: {0}", location), e); + } + } + + return loaded; + } +} Modified: root/trunk/core/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java =================================================================== --- root/trunk/core/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -137,14 +137,26 @@ EasyMock.eq("custom.library"), EasyMock.eq("org.richfaces.resource.MockStateAwareResource"), EasyMock.aryEq(resourceState.getBytes()), EasyMock.eq("4_0_alpha"))).andReturn("/rfRes/Resource0/4_0_alpha/data?l=custom.library"); + + EasyMock.expect(resourceCodec.encodeJSFMapping(EasyMock.same(facesContext), EasyMock.eq("/rfRes/Resource0/4_0_alpha/data?l=custom.library"))). + andReturn("/rfRes/Resource0/4_0_alpha/data.jsf?l=custom.library"); + EasyMock.expect(resourceCodec.encodeResourceRequestPath(EasyMock.same(facesContext), EasyMock.eq("custom.library"), EasyMock.eq("org.richfaces.resource.MockStateAwareResource"), EasyMock.eq(null), EasyMock.eq("4_0_alpha"))).andReturn("/rfRes/Resource1/4_0_alpha?l=custom.library"); + + EasyMock.expect(resourceCodec.encodeJSFMapping(EasyMock.same(facesContext), EasyMock.eq("/rfRes/Resource1/4_0_alpha?l=custom.library"))). + andReturn("/rfRes/Resource1/4_0_alpha.jsf?l=custom.library"); + EasyMock.expect(resourceCodec.encodeResourceRequestPath(EasyMock.same(facesContext), EasyMock.<String>isNull(), EasyMock.eq("org.richfaces.resource.MockResource"), EasyMock.eq(null), EasyMock.eq("4_0_alpha"))).andReturn("/rfRes/Resource2/4_0_alpha"); + + EasyMock.expect(resourceCodec.encodeJSFMapping(EasyMock.same(facesContext), EasyMock.eq("/rfRes/Resource2/4_0_alpha"))). + andReturn("/rfRes/Resource2/4_0_alpha.jsf"); + EasyMock.replay(resourceCodec); ServicesFactoryImpl injector = new ServicesFactoryImpl(); injector.init(Collections.<Module>singletonList(new Module(){ Modified: root/trunk/core/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java =================================================================== --- root/trunk/core/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -23,6 +23,8 @@ package org.richfaces.resource; +import static org.easymock.EasyMock.expect; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -227,15 +229,16 @@ final ResourceCodec mockedCodec = EasyMock.createNiceMock(ResourceCodec.class); final org.ajax4jsf.cache.Cache mockCache = EasyMock.createNiceMock(org.ajax4jsf.cache.Cache.class); - EasyMock.expect(mockedCodec.decodeResourceName(EasyMock.<FacesContext>notNull(), - EasyMock.eq("StateHolderResource"))).andReturn("org.richfaces.resource.StateHolderResourceImpl"); - EasyMock.expect(mockedCodec.decodeResourceData(EasyMock.<FacesContext>notNull(), - EasyMock.eq("StateHolderResource"))).andReturn("test text".getBytes()); - EasyMock.expect(mockedCodec.decodeResourceVersion(EasyMock.<FacesContext>notNull(), - EasyMock.eq("StateHolderResource"))).andReturn(null); - EasyMock.expect(mockedCodec.getResourceKey(EasyMock.<FacesContext>notNull(), - EasyMock.eq("StateHolderResource"))).andReturn("StateHolderResource.jsf?db=1"); - EasyMock.replay(mockedCodec,mockCache); + ResourceCodecData resourceCodecData = EasyMock.createMock(ResourceCodecData.class); + expect(resourceCodecData.getResourceName()).andStubReturn("org.richfaces.resource.StateHolderResourceImpl"); + expect(resourceCodecData.getLibraryName()).andStubReturn(null); + expect(resourceCodecData.getData()).andStubReturn("test text".getBytes()); + expect(resourceCodecData.getVersion()).andStubReturn(null); + expect(resourceCodecData.getResourceKey()).andStubReturn("StateHolderResource.jsf?db=1"); + + EasyMock.expect(mockedCodec.decodeResource(EasyMock.<FacesContext>notNull(), + EasyMock.eq("StateHolderResource"))).andReturn(resourceCodecData); + EasyMock.replay(mockedCodec, resourceCodecData, mockCache); ServicesFactoryImpl injector = new ServicesFactoryImpl(); injector.init(Collections.<Module>singletonList(new Module(){ @@ -255,6 +258,8 @@ assertEquals(HttpServletResponse.SC_OK, resourceResponse.getStatusCode()); assertEquals("test text", resourceResponse.getContentAsString("US-ASCII")); + + EasyMock.verify(mockedCodec, resourceCodecData, mockCache); } public void testVersionedResource() throws Exception { Modified: root/trunk/core/impl/src/test/java/org/richfaces/resource/StateHolderResourceImpl.java =================================================================== --- root/trunk/core/impl/src/test/java/org/richfaces/resource/StateHolderResourceImpl.java 2010-08-02 19:10:54 UTC (rev 18324) +++ root/trunk/core/impl/src/test/java/org/richfaces/resource/StateHolderResourceImpl.java 2010-08-02 19:36:31 UTC (rev 18325) @@ -42,6 +42,10 @@ public class StateHolderResourceImpl extends AbstractCacheableResource implements StateHolderResource { private Object state = ""; + public StateHolderResourceImpl() { + setResourceName(StateHolderResourceImpl.class.getName()); + } + @Override public InputStream getInputStream() throws IOException { try {

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18324 - root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources.

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

Author: konstantin.mishin Date: 2010-08-02 15:10:54 -0400 (Mon, 02 Aug 2010) New Revision: 18324 Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss Log: RF-8983 Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-08-02 18:40:51 UTC (rev 18323) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-08-02 19:10:54 UTC (rev 18324) @@ -64,8 +64,8 @@ .rf-ins-tt { position: absolute; display: none; - padding: 2px; - /*border: 1px solid '#{richSkin.tipBorderColor}'; + /* TODO padding: 2px; + border: 1px solid '#{richSkin.tipBorderColor}'; background-color: '#{richSkin.tipBackgroundColor}';*/ }

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18323 - in root/sandbox: examples/components/inputnumberslider-demo/src/main/webapp and 4 other directories.

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

Author: konstantin.mishin Date: 2010-08-02 14:40:51 -0400 (Mon, 02 Aug 2010) New Revision: 18323 Added: root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml Removed: root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml Modified: root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/WEB-INF/web.xml root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml Log: RF-8983 Modified: root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java =================================================================== --- root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java 2010-08-02 16:52:45 UTC (rev 18322) +++ root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java 2010-08-02 18:40:51 UTC (rev 18323) @@ -30,6 +30,9 @@ @SessionScoped public class Bean { + private String skin = "classic"; + private final String[] SKINS = {"blueSky", "deepMarine", "emeraldTown", "NULL", "ruby", "classic", "DEFAULT", "japanCherry", "plain", "wine"}; + private double value; private String accesskey; private int delay = 200; @@ -142,4 +145,16 @@ public void setStep(double step) { this.step = step; } + + public void setSkin(String skin) { + this.skin = skin; + } + + public String getSkin() { + return skin; + } + + public String[] getSkins() { + return SKINS; + } } Modified: root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/WEB-INF/web.xml 2010-08-02 16:52:45 UTC (rev 18322) +++ root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/WEB-INF/web.xml 2010-08-02 18:40:51 UTC (rev 18323) @@ -27,6 +27,10 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <context-param> + <param-name>org.richfaces.skin</param-name> + <param-value>#{bean.skin}</param-value> + </context-param> <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Deleted: root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml =================================================================== --- root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml 2010-08-02 16:52:45 UTC (rev 18322) +++ root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml 2010-08-02 18:40:51 UTC (rev 18323) @@ -1,100 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:ins="http://richfaces.org/inputnumberslider"> - - <h:head> - <title>Richfaces InputNumberSlider Demo</title> - </h:head> - <h:body> - <h:form id="form"> - <ins:inputnumberslider id="ins" value="#{bean.value}" accesskey="#{bean.accesskey}" - delay="#{bean.delay}" enableManualInput="#{bean.enableManualInput}" showArrows="#{bean.showArrows}" - showBoundaryValues="#{bean.showBoundaryValues}" showInput="#{bean.showInput}" - showToolTip="#{bean.showToolTip}" maxValue="#{bean.maxValue}" minValue="#{bean.minValue}" - step="#{bean.step}" inputPosition="#{bean.inputPosition}"/> - - <h:outputText value="Accesskey: "/> - <h:inputText value="#{bean.accesskey}"> - <f:ajax render="ins"/> - </h:inputText> - - <h:outputText value="EnableManualInput: "/> - <h:selectBooleanCheckbox value="#{bean.enableManualInput}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - - <h:outputText value="Delay: "/> - <h:inputText value="#{bean.delay}"> - <f:ajax render="ins"/> - </h:inputText> - - <h:outputText value="InputPosition: "/> - <h:selectOneMenu value="#{bean.inputPosition}"> - <f:selectItems value="#{bean.positionTypes}"/> - <f:ajax render="ins"/> - </h:selectOneMenu> - - <h:outputText value="MaxValue: "/> - <h:inputText value="#{bean.maxValue}"> - <f:ajax render="ins"/> - </h:inputText> - - <h:outputText value="MinValue: "/> - <h:inputText value="#{bean.minValue}"> - <f:ajax render="ins"/> - </h:inputText> - - <h:outputText value="ShowArrows: "/> - <h:selectBooleanCheckbox value="#{bean.showArrows}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - - <h:outputText value="ShowBoundaryValues: "/> - <h:selectBooleanCheckbox value="#{bean.showBoundaryValues}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - - <h:outputText value="ShowInput: "/> - <h:selectBooleanCheckbox value="#{bean.showInput}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - - <h:outputText value="ShowToolTip: "/> - <h:selectBooleanCheckbox value="#{bean.showToolTip}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - - <h:outputText value="Step: "/> - <h:inputText value="#{bean.step}"> - <f:ajax render="ins"/> - </h:inputText> - </h:form> - </h:body> -</html> Added: root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml =================================================================== --- root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml (rev 0) +++ root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml 2010-08-02 18:40:51 UTC (rev 18323) @@ -0,0 +1,105 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:ins="http://richfaces.org/inputnumberslider"> + + <h:head> + <title>Richfaces InputNumberSlider Demo</title> + </h:head> + <h:body> + <h:form id="form"> + <h:outputText value="Skin: "/> + <h:selectOneMenu value="#{bean.skin}" onchange="submit();"> + <f:selectItems value="#{bean.skins}"/> + </h:selectOneMenu> + + <ins:inputnumberslider id="ins" value="#{bean.value}" accesskey="#{bean.accesskey}" + delay="#{bean.delay}" enableManualInput="#{bean.enableManualInput}" showArrows="#{bean.showArrows}" + showBoundaryValues="#{bean.showBoundaryValues}" showInput="#{bean.showInput}" + showToolTip="#{bean.showToolTip}" maxValue="#{bean.maxValue}" minValue="#{bean.minValue}" + step="#{bean.step}" inputPosition="#{bean.inputPosition}"/> + + <h:outputText value="Accesskey: "/> + <h:inputText value="#{bean.accesskey}"> + <f:ajax render="ins"/> + </h:inputText> + + <h:outputText value="EnableManualInput: "/> + <h:selectBooleanCheckbox value="#{bean.enableManualInput}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="Delay: "/> + <h:inputText value="#{bean.delay}"> + <f:ajax render="ins"/> + </h:inputText> + + <h:outputText value="InputPosition: "/> + <h:selectOneMenu value="#{bean.inputPosition}"> + <f:selectItems value="#{bean.positionTypes}"/> + <f:ajax render="ins"/> + </h:selectOneMenu> + + <h:outputText value="MaxValue: "/> + <h:inputText value="#{bean.maxValue}"> + <f:ajax render="ins"/> + </h:inputText> + + <h:outputText value="MinValue: "/> + <h:inputText value="#{bean.minValue}"> + <f:ajax render="ins"/> + </h:inputText> + + <h:outputText value="ShowArrows: "/> + <h:selectBooleanCheckbox value="#{bean.showArrows}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowBoundaryValues: "/> + <h:selectBooleanCheckbox value="#{bean.showBoundaryValues}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowInput: "/> + <h:selectBooleanCheckbox value="#{bean.showInput}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowToolTip: "/> + <h:selectBooleanCheckbox value="#{bean.showToolTip}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="Step: "/> + <h:inputText value="#{bean.step}"> + <f:ajax render="ins"/> + </h:inputText> + </h:form> + </h:body> +</html> Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-02 16:52:45 UTC (rev 18322) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-02 18:40:51 UTC (rev 18323) @@ -168,6 +168,13 @@ </property-extension> </property> <property> + <property-name>toolTipClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> <property-name>trackClass</property-name> <property-class>java.lang.String</property-class> <property-extension> Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-08-02 16:52:45 UTC (rev 18322) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-08-02 18:40:51 UTC (rev 18323) @@ -64,6 +64,9 @@ .rf-ins-tt { position: absolute; display: none; + padding: 2px; + /*border: 1px solid '#{richSkin.tipBorderColor}'; + background-color: '#{richSkin.tipBackgroundColor}';*/ } .rf-ins-t { Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-02 16:52:45 UTC (rev 18322) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-02 18:40:51 UTC (rev 18323) @@ -76,7 +76,7 @@ style="#{component.attributes['showInput'] ? null : 'display: none;'}" /> </c:if> <c:if test="#{component.attributes['showToolTip']}"> - #{getInputValue(facesContext, component)} + #{getInputValue(facesContext, component)} </c:if> <script type="text/javascript">new RichFaces.ui.InputNumberSlider('#{clientId}', { delay: #{component.attributes['delay']},

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18322 - in root/sandbox/ui/inputs/inputnumberslider: src/main/config and 2 other directories.

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

Author: konstantin.mishin Date: 2010-08-02 12:52:45 -0400 (Mon, 02 Aug 2010) New Revision: 18322 Modified: root/sandbox/ui/inputs/inputnumberslider/pom.xml root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml Log: RF-8983 Modified: root/sandbox/ui/inputs/inputnumberslider/pom.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/pom.xml 2010-08-02 16:24:05 UTC (rev 18321) +++ root/sandbox/ui/inputs/inputnumberslider/pom.xml 2010-08-02 16:52:45 UTC (rev 18322) @@ -57,11 +57,11 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> </dependency> - <dependency> +  <dependency> <groupId>${jsf2.api.groupid}</groupId> Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-02 16:24:05 UTC (rev 18321) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-02 16:52:45 UTC (rev 18322) @@ -38,6 +38,20 @@ </property-extension> </property> <property> + <property-name>decreaseClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>decreaseSelectedClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> <property-name>delay</property-name> <property-class>int</property-class> <default-value>200</default-value> @@ -54,6 +68,34 @@ </property-extension> </property> <property> + <property-name>handleClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>handleSelectedClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>increaseClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>increaseSelectedClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> <property-name>inputPosition</property-name> <property-class>org.richfaces.renderkit.html.PositionType</property-class> <default-value>PositionType.right</default-value> Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-08-02 16:24:05 UTC (rev 18321) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-08-02 16:52:45 UTC (rev 18322) @@ -31,8 +31,15 @@ minValue: 0, step: 1, - init: function (id, options) { + decreaseSelectedClass: "rf-ins-db-s", + handleSelectedClass: "rf-ins-h-s", + increaseSelectedClass: "rf-ins-ib-s", + + init: function (id, options, selectedClasses) { jQuery.extend(this, options); + for (var i in selectedClasses) { + this[i] += " " + selectedClasses[i]; + } this.range = this.maxValue - this.minValue; this.id = id; this.element = jQuery(this.attachToDom()); @@ -99,7 +106,7 @@ component.setValue(Number(component.input.val()) - component.step); }, this.delay); jQuery(document).one("mouseup", true, jQuery.proxy(this.__clearInterval, this)); - this.decrease.addClass("rf-ins-db-s"); + this.decrease.addClass(this.decreaseSelectedClass); event.preventDefault(); }, @@ -109,16 +116,16 @@ component.setValue(Number(component.input.val()) + component.step); }, this.delay); jQuery(document).one("mouseup",jQuery.proxy(this.__clearInterval, this)); - this.increase.addClass("rf-ins-ib-s"); + this.increase.addClass(this.increaseSelectedClass); event.preventDefault(); }, __clearInterval: function (event) { window.clearInterval(this.intervalId); - if (event.data) { // increase - this.decrease.removeClass("rf-ins-db-s"); + if (event.data) { // decrease + this.decrease.removeClass(this.decreaseSelectedClass); } else { - this.increase.removeClass("rf-ins-ib-s"); + this.increase.removeClass(this.increaseSelectedClass); } }, @@ -128,7 +135,7 @@ var jQueryDocument = jQuery(document); jQueryDocument.mousemove(jQuery.proxy(this.__mousemoveHandler, this)); jQueryDocument.one("mouseup", jQuery.proxy(this.__mouseupHandler, this)); - this.handle.addClass("rf-ins-h-s"); + this.handle.addClass(this.handleSelectedClass); this.tooltip.show(); }, @@ -140,7 +147,7 @@ }, __mouseupHandler: function () { - this.handle.removeClass("rf-ins-h-s"); + this.handle.removeClass(this.handleSelectedClass); this.tooltip.hide(); jQuery(document).unbind("mousemove", this.__mousemoveHandler); } Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-02 16:24:05 UTC (rev 18321) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-02 16:52:45 UTC (rev 18322) @@ -51,7 +51,7 @@ </c:if> </c:if> <c:if test="#{component.attributes['showArrows']}"> - <a class="rf-ins-db" href="javascript:void(0);" /> + <a class="rf-ins-db #{component.attributes['decreaseClass']}" href="javascript:void(0);" /> </c:if> <c:if test="#{component.attributes['showBoundaryValues']}"> @@ -59,11 +59,11 @@ #{component.attributes['maxValue']} </c:if> - + <c:if test="#{component.attributes['showArrows']}"> - <a class="rf-ins-ib" href="javascript:void(0);" /> + <a class="rf-ins-ib #{component.attributes['increaseClass']}" href="javascript:void(0);" /> </c:if> <c:if test="#{PositionType.valueOf('right') == component.attributes['inputPosition'] || PositionType.valueOf('bottom') == component.attributes['inputPosition']}"> @@ -83,6 +83,10 @@ maxValue: #{component.attributes['maxValue']}, minValue: #{component.attributes['minValue']}, step: #{component.attributes['step']} + }, { + decreaseSelectedClass: '#{component.attributes['decreaseSelectedClass']}', + handleSelectedClass: '#{component.attributes['handleSelectedClass']}', + increaseSelectedClass: '#{component.attributes['increaseSelectedClass']}' });</script> </cc:implementation>

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18321 - in root/sandbox: examples/components/inputnumberslider-demo/src/main/webapp and 5 other directories.

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

Author: konstantin.mishin Date: 2010-08-02 12:24:05 -0400 (Mon, 02 Aug 2010) New Revision: 18321 Added: root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/PositionType.java root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java Removed: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/bg_field.gif Modified: root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml Log: RF-8983 Modified: root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java =================================================================== --- root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java 2010-08-02 15:31:36 UTC (rev 18320) +++ root/sandbox/examples/components/inputnumberslider-demo/src/main/java/org/richfaces/demo/Bean.java 2010-08-02 16:24:05 UTC (rev 18321) @@ -24,19 +24,30 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; +import org.richfaces.renderkit.html.PositionType; + @ManagedBean(name = "bean") @SessionScoped public class Bean { - private int value; + private double value; private String accesskey; + private int delay = 200; private boolean enableManualInput = true; + private PositionType inputPosition = PositionType.right; + private double maxValue = 100; + private double minValue = 0; + private boolean showArrows = false; + private boolean showBoundaryValues = true; + private boolean showInput = true; + private boolean showToolTip = true; + private double step = 1; - public void setValue(int value) { + public void setValue(double value) { this.value = value; } - public int getValue() { + public double getValue() { return value; } @@ -48,6 +59,14 @@ return accesskey; } + public int getDelay() { + return delay; + } + + public void setDelay(int delay) { + this.delay = delay; + } + public void setEnableManualInput(boolean enableManualInput) { this.enableManualInput = enableManualInput; } @@ -55,4 +74,72 @@ public boolean getEnableManualInput() { return enableManualInput; } + + public void setInputPosition(PositionType inputPosition) { + this.inputPosition = inputPosition; + } + + public PositionType getInputPosition() { + return inputPosition; + } + + public PositionType[] getPositionTypes() { + return PositionType.values(); + } + + public double getMaxValue() { + return maxValue; + } + + public void setMaxValue(double maxValue) { + this.maxValue = maxValue; + } + + public double getMinValue() { + return minValue; + } + + public void setMinValue(double minValue) { + this.minValue = minValue; + } + + public boolean isShowArrows() { + return showArrows; + } + + public void setShowArrows(boolean showArrows) { + this.showArrows = showArrows; + } + + public boolean isShowBoundaryValues() { + return showBoundaryValues; + } + + public void setShowBoundaryValues(boolean showBoundaryValues) { + this.showBoundaryValues = showBoundaryValues; + } + + public boolean isShowInput() { + return showInput; + } + + public void setShowInput(boolean showInput) { + this.showInput = showInput; + } + + public boolean isShowToolTip() { + return showToolTip; + } + + public void setShowToolTip(boolean showToolTip) { + this.showToolTip = showToolTip; + } + + public double getStep() { + return step; + } + + public void setStep(double step) { + this.step = step; + } } Modified: root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml =================================================================== --- root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml 2010-08-02 15:31:36 UTC (rev 18320) +++ root/sandbox/examples/components/inputnumberslider-demo/src/main/webapp/index.xhtml 2010-08-02 16:24:05 UTC (rev 18321) @@ -35,7 +35,10 @@ <h:body> <h:form id="form"> <ins:inputnumberslider id="ins" value="#{bean.value}" accesskey="#{bean.accesskey}" - enableManualInput="#{bean.enableManualInput}"/> + delay="#{bean.delay}" enableManualInput="#{bean.enableManualInput}" showArrows="#{bean.showArrows}" + showBoundaryValues="#{bean.showBoundaryValues}" showInput="#{bean.showInput}" + showToolTip="#{bean.showToolTip}" maxValue="#{bean.maxValue}" minValue="#{bean.minValue}" + step="#{bean.step}" inputPosition="#{bean.inputPosition}"/> <h:outputText value="Accesskey: "/> <h:inputText value="#{bean.accesskey}"> @@ -45,7 +48,53 @@ <h:outputText value="EnableManualInput: "/> <h:selectBooleanCheckbox value="#{bean.enableManualInput}"> <f:ajax render="ins"/> - </h:selectBooleanCheckbox> + </h:selectBooleanCheckbox> + + <h:outputText value="Delay: "/> + <h:inputText value="#{bean.delay}"> + <f:ajax render="ins"/> + </h:inputText> + + <h:outputText value="InputPosition: "/> + <h:selectOneMenu value="#{bean.inputPosition}"> + <f:selectItems value="#{bean.positionTypes}"/> + <f:ajax render="ins"/> + </h:selectOneMenu> + + <h:outputText value="MaxValue: "/> + <h:inputText value="#{bean.maxValue}"> + <f:ajax render="ins"/> + </h:inputText> + + <h:outputText value="MinValue: "/> + <h:inputText value="#{bean.minValue}"> + <f:ajax render="ins"/> + </h:inputText> + + <h:outputText value="ShowArrows: "/> + <h:selectBooleanCheckbox value="#{bean.showArrows}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowBoundaryValues: "/> + <h:selectBooleanCheckbox value="#{bean.showBoundaryValues}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowInput: "/> + <h:selectBooleanCheckbox value="#{bean.showInput}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowToolTip: "/> + <h:selectBooleanCheckbox value="#{bean.showToolTip}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + + <h:outputText value="Step: "/> + <h:inputText value="#{bean.step}"> + <f:ajax render="ins"/> + </h:inputText> </h:form> </h:body> </html> Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-02 15:31:36 UTC (rev 18320) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-02 16:24:05 UTC (rev 18321) @@ -38,6 +38,14 @@ </property-extension> </property> <property> + <property-name>delay</property-name> + <property-class>int</property-class> + <default-value>200</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> <property-name>enableManualInput</property-name> <property-class>boolean</property-class> <default-value>true</default-value> @@ -46,14 +54,79 @@ </property-extension> </property> <property> - <property-name>trackClass</property-name> - <property-class>java.lang.String</property-class> + <property-name>inputPosition</property-name> + <property-class>org.richfaces.renderkit.html.PositionType</property-class> + <default-value>PositionType.right</default-value> <property-extension> <cdk:generate>true</cdk:generate> </property-extension> </property> <property> - <property-name>trackStyle</property-name> + <property-name>maxValue</property-name> + <property-class>double</property-class> + <default-value>100</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>minValue</property-name> + <property-class>double</property-class> + <default-value>0</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>minValue</property-name> + <property-class>double</property-class> + <default-value>0</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>showArrows</property-name> + <property-class>boolean</property-class> + <default-value>false</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>showBoundaryValues</property-name> + <property-class>boolean</property-class> + <default-value>true</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>showInput</property-name> + <property-class>boolean</property-class> + <default-value>true</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>showToolTip</property-name> + <property-class>boolean</property-class> + <default-value>true</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>step</property-name> + <property-class>double</property-class> + <default-value>1</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>trackClass</property-name> <property-class>java.lang.String</property-class> <property-extension> <cdk:generate>true</cdk:generate> Added: root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/PositionType.java =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/PositionType.java (rev 0) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/PositionType.java 2010-08-02 16:24:05 UTC (rev 18321) @@ -0,0 +1,5 @@ +package org.richfaces.renderkit.html; + +public enum PositionType { + top, right, bottom, left +} Added: root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java (rev 0) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java 2010-08-02 16:24:05 UTC (rev 18321) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + + +/** + * @author Konstantin Mishin + * + */ +public class SliderSelectedArrowLeft extends SliderArrowLeft { + + public SliderSelectedArrowLeft() { + setColorName("tipBorderColor"); + } +} Added: root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java (rev 0) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java 2010-08-02 16:24:05 UTC (rev 18321) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + + +/** + * @author Konstantin Mishin + * + */ +public class SliderSelectedArrowRight extends SliderArrowRight { + + public SliderSelectedArrowRight() { + setColorName("tipBorderColor"); + } +} Deleted: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/bg_field.gif =================================================================== (Binary files differ) Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-08-02 15:31:36 UTC (rev 18320) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-08-02 16:24:05 UTC (rev 18321) @@ -31,7 +31,7 @@ width: 200px; /*TODO remove it*/ } -.rf-ins-mn, .rf-ins-mx, .rf-ins-i, .rf-ins-tt { +.rf-ins-mn, .rf-ins-mx, input.rf-ins-i, .rf-ins-tt { font-size: 11px; font-family: arial; color: #000000; @@ -56,9 +56,9 @@ } input.rf-ins-i { - background: url("#{resource['bg_field.gif']}") top repeat-x #fff; + background: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}") top repeat-x #fff; border: 1px inset #C0C0C0; - margin-left: 10px; + margin: 10px; } .rf-ins-tt { @@ -92,6 +92,14 @@ background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowLeft']}"); } +.rf-ins-db-s { + background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowLeft']}"); +} + .rf-ins-ib { background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowRight']}"); +} + +.rf-ins-ib-s { + background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowRight']}"); } \ No newline at end of file Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-08-02 15:31:36 UTC (rev 18320) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-08-02 16:24:05 UTC (rev 18321) @@ -26,12 +26,13 @@ name: "InputNumberSlider", + delay: 200, + maxValue: 100, minValue: 0, - maxValue: 100, - step: 5, - value: 0, + step: 1, - init: function (id) { + init: function (id, options) { + jQuery.extend(this, options); this.range = this.maxValue - this.minValue; this.id = id; this.element = jQuery(this.attachToDom()); @@ -39,32 +40,32 @@ this.track = this.element.children(".rf-ins-ta").children(".rf-ins-t"); this.handle = this.track.children(".rf-ins-h"); this.tooltip = this.element.children(".rf-ins-tt"); + this.decrease = this.element.children(".rf-ins-db"); + this.increase = this.element.children(".rf-ins-ib"); - this.value = Number(this.input.val()); + this.__inputHandler(); this.track[0].tabIndex = 0; - this.handle.css("margin-left", this.input.val() * (this.track.width() - this.handle.width()) / this.range); var proxy = jQuery.proxy(this.__inputHandler, this) this.input.change(proxy); this.input.submit(proxy); this.track.keydown(jQuery.proxy(this.__keydownHandler, this)); - this.element.children(".rf-ins-db").mousedown(jQuery.proxy(this.__decreaseHandler, this)); - this.element.children(".rf-ins-ib").mousedown(jQuery.proxy(this.__increaseHandler, this)); + this.decrease.mousedown(jQuery.proxy(this.__decreaseHandler, this)); + this.increase.mousedown(jQuery.proxy(this.__increaseHandler, this)); this.track.mousedown(jQuery.proxy(this.__mousedownHandler, this)); }, setValue: function (value) { if (!isNaN(value)) { + value = Math.round(value / this.step) * this.step; //TODO Add normal support of float values. E.g. '0.3' should be instead of '0.30000000000000004'. if (value > this.maxValue) { value = this.maxValue; } else if (value < this.minValue) { value = this.minValue; - } else { - value = Math.round(value / this.step) * this.step; //TODO Add normal support of float values. E.g. '0.3' should be instead of '0.30000000000000004'. } if (value != this.value) { this.input.val(value); - var left = value * (this.track.width() - this.handle.width()) / this.range; + var left = (value - this.minValue) * (this.track.width() - this.handle.width()) / this.range; this.handle.css("margin-left", left + "px"); this.tooltip.text(value); this.tooltip.setPosition(this.handle,{from: 'LT', offset: [0, -3]}); //TODO Seems offset doesn't work now. @@ -93,13 +94,34 @@ }, __decreaseHandler: function (event) { - this.setValue(Number(this.input.val()) - this.step); + var component = this; + this.intervalId = window.setInterval(function() { + component.setValue(Number(component.input.val()) - component.step); + }, this.delay); + jQuery(document).one("mouseup", true, jQuery.proxy(this.__clearInterval, this)); + this.decrease.addClass("rf-ins-db-s"); + event.preventDefault(); }, __increaseHandler: function (event) { - this.setValue(Number(this.input.val()) + this.step); + var component = this; + this.intervalId = window.setInterval(function() { + component.setValue(Number(component.input.val()) + component.step); + }, this.delay); + jQuery(document).one("mouseup",jQuery.proxy(this.__clearInterval, this)); + this.increase.addClass("rf-ins-ib-s"); + event.preventDefault(); }, + __clearInterval: function (event) { + window.clearInterval(this.intervalId); + if (event.data) { // increase + this.decrease.removeClass("rf-ins-db-s"); + } else { + this.increase.removeClass("rf-ins-ib-s"); + } + }, + __mousedownHandler: function (event) { this.__mousemoveHandler(event); this.track.focus(); Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-02 15:31:36 UTC (rev 18320) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-02 16:24:05 UTC (rev 18321) @@ -24,7 +24,7 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> <cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core" - xmlns:cc="http://richfaces.org/cdk/jsf/composite"> + xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:c="http://richfaces.org/cdk/jstl/core"> <cc:interface> <cdk:class>org.richfaces.renderkit.html.InputNumberSliderRenderer</cdk:class> <cdk:superclass>org.richfaces.renderkit.InputRendererBase</cdk:superclass> @@ -40,20 +40,50 @@ </cc:interface> <cc:implementation> - <a class="rf-ins-db" href="javascript:void(0);" /> + <c:if test="#{PositionType.valueOf('left') == component.attributes['inputPosition'] + || PositionType.valueOf('top') == component.attributes['inputPosition']}"> + <input name="#{clientId}" type="text" class="rf-ins-i" size="3" + value="#{getInputValue(facesContext, component)}" accesskey="#{component.attributes['accesskey']}" + readonly="#{!component.attributes['enableManualInput']}" + style="#{component.attributes['showInput'] ? null : 'display: none;'}" /> + <c:if test="#{PositionType.valueOf('top') == component.attributes['inputPosition'] and component.attributes['showInput']}"> + + </c:if> + </c:if> + <c:if test="#{component.attributes['showArrows']}"> + <a class="rf-ins-db" href="javascript:void(0);" /> + </c:if> - 0 - 100 - + <c:if test="#{component.attributes['showBoundaryValues']}"> + #{component.attributes['minValue']} + #{component.attributes['maxValue']} + </c:if> + - <a class="rf-ins-ib" href="javascript:void(0);" /> - <input name="#{clientId}" type="text" class="rf-ins-i" size="3" - value="#{getInputValue(facesContext, component)}" accesskey="#{component.attributes['accesskey']}" - readonly="#{!component.attributes['enableManualInput']}"/> - #{getInputValue(facesContext, component)} - <script type="text/javascript">new RichFaces.ui.InputNumberSlider('#{clientId}');</script> + <c:if test="#{component.attributes['showArrows']}"> + <a class="rf-ins-ib" href="javascript:void(0);" /> + </c:if> + <c:if test="#{PositionType.valueOf('right') == component.attributes['inputPosition'] + || PositionType.valueOf('bottom') == component.attributes['inputPosition']}"> + <c:if test="#{PositionType.valueOf('bottom') == component.attributes['inputPosition'] and component.attributes['showInput']}"> + + </c:if> + <input name="#{clientId}" type="text" class="rf-ins-i" size="3" + value="#{getInputValue(facesContext, component)}" accesskey="#{component.attributes['accesskey']}" + readonly="#{!component.attributes['enableManualInput']}" + style="#{component.attributes['showInput'] ? null : 'display: none;'}" /> + </c:if> + <c:if test="#{component.attributes['showToolTip']}"> + #{getInputValue(facesContext, component)} + </c:if> + <script type="text/javascript">new RichFaces.ui.InputNumberSlider('#{clientId}', { + delay: #{component.attributes['delay']}, + maxValue: #{component.attributes['maxValue']}, + minValue: #{component.attributes['minValue']}, + step: #{component.attributes['step']} + });</script> </cc:implementation> </cdk:root>

13 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18320 - in root: trunk and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2010-08-02 11:31:36 -0400 (Mon, 02 Aug 2010) New Revision: 18320 Modified: root/pom.xml root/trunk/pom.xml Log: Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-08-02 14:44:42 UTC (rev 18319) +++ root/pom.xml 2010-08-02 15:31:36 UTC (rev 18320) @@ -4,24 +4,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> -  -  -  -  -  + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>5</version> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> - <artifactId>root</artifactId> + <artifactId>root-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces Root</name> <modules> - <module>build/parent/trunk</module> +   - <module>trunk</module> <module>sandbox/examples</module> <module>sandbox/ui</module> + <module>trunk</module> </modules> </project> Modified: root/trunk/pom.xml =================================================================== --- root/trunk/pom.xml 2010-08-02 14:44:42 UTC (rev 18319) +++ root/trunk/pom.xml 2010-08-02 15:31:36 UTC (rev 18320) @@ -39,7 +39,7 @@ <profile> <id>release</id> <modules> - <module>dist/${richfaces.dist.path}</module> + <module>dist</module> </modules> </profile> </profiles>

13 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits August 2010