August 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r18983 - modules/docs/tags.

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

Author: SeanRogers Date: 2010-08-25 19:59:55 -0400 (Wed, 25 Aug 2010) New Revision: 18983 Removed: modules/docs/tags/4.0.0.20100825-M2/ Log: Removing doc tag for update

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18982 - modules/docs/trunk/Component_Development_Kit_Guide.

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

Author: SeanRogers Date: 2010-08-25 19:09:03 -0400 (Wed, 25 Aug 2010) New Revision: 18982 Modified: modules/docs/trunk/Component_Development_Kit_Guide/pom.xml Log: Updated CDK Guide groupId Modified: modules/docs/trunk/Component_Development_Kit_Guide/pom.xml =================================================================== --- modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-08-25 22:37:32 UTC (rev 18981) +++ modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-08-25 23:09:03 UTC (rev 18982) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.cdk-guide</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>richfaces-cdk-guide</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging>

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18981 - in modules/docs/trunk: Component_Development_Kit_Guide and 4 other directories.

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

Author: SeanRogers Date: 2010-08-25 18:37:32 -0400 (Wed, 25 Aug 2010) New Revision: 18981 Modified: modules/docs/trunk/Component_Development_Kit_Guide/pom.xml modules/docs/trunk/Component_Reference/pom.xml modules/docs/trunk/Developer_Guide/pom.xml modules/docs/trunk/Migration_Guide/pom.xml modules/docs/trunk/parent/pom.xml modules/docs/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: modules/docs/trunk/Component_Development_Kit_Guide/pom.xml =================================================================== --- modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-08-25 22:37:18 UTC (rev 18980) +++ modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-08-25 22:37:32 UTC (rev 18981) @@ -4,14 +4,14 @@ <groupId>org.richfaces.cdk-guide</groupId> <artifactId>richfaces-cdk-guide</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RichFaces CDK Guide</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -106,9 +106,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Compo...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Componen...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Component_De...</url> </scm> </project> Modified: modules/docs/trunk/Component_Reference/pom.xml =================================================================== --- modules/docs/trunk/Component_Reference/pom.xml 2010-08-25 22:37:18 UTC (rev 18980) +++ modules/docs/trunk/Component_Reference/pom.xml 2010-08-25 22:37:32 UTC (rev 18981) @@ -4,14 +4,14 @@ <groupId>org.richfaces.docs</groupId> <artifactId>richfaces-component-reference</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RichFaces Component Reference</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -106,9 +106,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Compo...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Componen...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Component_Re...</url> </scm> </project> Modified: modules/docs/trunk/Developer_Guide/pom.xml =================================================================== --- modules/docs/trunk/Developer_Guide/pom.xml 2010-08-25 22:37:18 UTC (rev 18980) +++ modules/docs/trunk/Developer_Guide/pom.xml 2010-08-25 22:37:32 UTC (rev 18981) @@ -4,14 +4,14 @@ <groupId>org.richfaces.docs</groupId> <artifactId>richfaces-developer-guide</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RichFaces Developer Guide</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -107,9 +107,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Devel...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Develope...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Developer_Guide</url> </scm> </project> Modified: modules/docs/trunk/Migration_Guide/pom.xml =================================================================== --- modules/docs/trunk/Migration_Guide/pom.xml 2010-08-25 22:37:18 UTC (rev 18980) +++ modules/docs/trunk/Migration_Guide/pom.xml 2010-08-25 22:37:32 UTC (rev 18981) @@ -4,14 +4,14 @@ <groupId>org.richfaces.docs</groupId> <artifactId>richfaces-migration-guide</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RichFaces Migration Guide</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -107,9 +107,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Migra...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Migratio...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Migration_Guide</url> </scm> </project> Modified: modules/docs/trunk/parent/pom.xml =================================================================== --- modules/docs/trunk/parent/pom.xml 2010-08-25 22:37:18 UTC (rev 18980) +++ modules/docs/trunk/parent/pom.xml 2010-08-25 22:37:32 UTC (rev 18981) @@ -28,7 +28,7 @@ <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces Docs: Parent</name> <packaging>pom</packaging> <url>http://richfaces.org</url> @@ -218,8 +218,8 @@ --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/parent</url> </scm> </project> Modified: modules/docs/trunk/pom.xml =================================================================== --- modules/docs/trunk/pom.xml 2010-08-25 22:37:18 UTC (rev 18980) +++ modules/docs/trunk/pom.xml 2010-08-25 22:37:32 UTC (rev 18981) @@ -9,7 +9,7 @@ <groupId>org.richfaces.docs</groupId> <artifactId>docs-aggregator</artifactId> - <version>4.0.0.20100825-M2</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RichFaces Document Aggregator</name> @@ -22,9 +22,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk</url> </scm> </project>

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18980 - modules/docs/tags.

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

Author: SeanRogers Date: 2010-08-25 18:37:18 -0400 (Wed, 25 Aug 2010) New Revision: 18980 Added: modules/docs/tags/4.0.0.20100825-M2/ Log: [maven-scm] copy for tag 4.0.0.20100825-M2 Copied: modules/docs/tags/4.0.0.20100825-M2 (from rev 18979, modules/docs/trunk)

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18979 - in modules/docs/trunk: Component_Development_Kit_Guide and 4 other directories.

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

Author: SeanRogers Date: 2010-08-25 18:36:54 -0400 (Wed, 25 Aug 2010) New Revision: 18979 Modified: modules/docs/trunk/Component_Development_Kit_Guide/pom.xml modules/docs/trunk/Component_Reference/pom.xml modules/docs/trunk/Developer_Guide/pom.xml modules/docs/trunk/Migration_Guide/pom.xml modules/docs/trunk/parent/pom.xml modules/docs/trunk/pom.xml Log: [maven-release-plugin] prepare release 4.0.0.20100825-M2 Modified: modules/docs/trunk/Component_Development_Kit_Guide/pom.xml =================================================================== --- modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-08-25 22:15:44 UTC (rev 18978) +++ modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-08-25 22:36:54 UTC (rev 18979) @@ -4,14 +4,14 @@ <groupId>org.richfaces.cdk-guide</groupId> <artifactId>richfaces-cdk-guide</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <packaging>jdocbook</packaging> <name>RichFaces CDK Guide</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -106,9 +106,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Compo...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Componen...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Component_De...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> </scm> </project> Modified: modules/docs/trunk/Component_Reference/pom.xml =================================================================== --- modules/docs/trunk/Component_Reference/pom.xml 2010-08-25 22:15:44 UTC (rev 18978) +++ modules/docs/trunk/Component_Reference/pom.xml 2010-08-25 22:36:54 UTC (rev 18979) @@ -4,14 +4,14 @@ <groupId>org.richfaces.docs</groupId> <artifactId>richfaces-component-reference</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <packaging>jdocbook</packaging> <name>RichFaces Component Reference</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -106,9 +106,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Compo...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Componen...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Component_Re...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> </scm> </project> Modified: modules/docs/trunk/Developer_Guide/pom.xml =================================================================== --- modules/docs/trunk/Developer_Guide/pom.xml 2010-08-25 22:15:44 UTC (rev 18978) +++ modules/docs/trunk/Developer_Guide/pom.xml 2010-08-25 22:36:54 UTC (rev 18979) @@ -4,14 +4,14 @@ <groupId>org.richfaces.docs</groupId> <artifactId>richfaces-developer-guide</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <packaging>jdocbook</packaging> <name>RichFaces Developer Guide</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -107,9 +107,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Devel...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Develope...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Developer_Guide</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> </scm> </project> Modified: modules/docs/trunk/Migration_Guide/pom.xml =================================================================== --- modules/docs/trunk/Migration_Guide/pom.xml 2010-08-25 22:15:44 UTC (rev 18978) +++ modules/docs/trunk/Migration_Guide/pom.xml 2010-08-25 22:36:54 UTC (rev 18979) @@ -4,14 +4,14 @@ <groupId>org.richfaces.docs</groupId> <artifactId>richfaces-migration-guide</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <packaging>jdocbook</packaging> <name>RichFaces Migration Guide</name> <parent> <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -107,9 +107,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Migra...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Migratio...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Migration_Guide</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> </scm> </project> Modified: modules/docs/trunk/parent/pom.xml =================================================================== --- modules/docs/trunk/parent/pom.xml 2010-08-25 22:15:44 UTC (rev 18978) +++ modules/docs/trunk/parent/pom.xml 2010-08-25 22:36:54 UTC (rev 18979) @@ -28,7 +28,7 @@ <groupId>org.richfaces.docs</groupId> <artifactId>docs-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <name>Richfaces Docs: Parent</name> <packaging>pom</packaging> <url>http://richfaces.org</url> @@ -218,8 +218,8 @@ --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/parent</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> </scm> </project> Modified: modules/docs/trunk/pom.xml =================================================================== --- modules/docs/trunk/pom.xml 2010-08-25 22:15:44 UTC (rev 18978) +++ modules/docs/trunk/pom.xml 2010-08-25 22:36:54 UTC (rev 18979) @@ -9,7 +9,7 @@ <groupId>org.richfaces.docs</groupId> <artifactId>docs-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.20100825-M2</version> <packaging>pom</packaging> <name>RichFaces Document Aggregator</name> @@ -22,9 +22,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.0.0.201...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.0.0.2010082...</url> </scm> </project>

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18978 - in trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources: src/main/webapp/WEB-INF and 1 other directory.

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

Author: jbalunas(a)redhat.com Date: 2010-08-25 18:15:44 -0400 (Wed, 25 Aug 2010) New Revision: 18978 Added: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Log: RFPL-772 Working around JBAS-8361 for richfaces archetypes Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-08-25 21:59:45 UTC (rev 18977) +++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-08-25 22:15:44 UTC (rev 18978) @@ -74,19 +74,6 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> -  - <exclusions> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> Added: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml (rev 0) +++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-08-25 22:15:44 UTC (rev 18978) @@ -0,0 +1,11 @@ +<scanning xmlns="urn:jboss:scanning:1.0"> + + <path name="WEB-INF/classes"></path> + + <path name="WEB-INF/lib/guava-r05.jar"> + <exclude name="com.google.common.collect" /> + </path> +</scanning> \ No newline at end of file Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-08-25 21:59:45 UTC (rev 18977) +++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-08-25 22:15:44 UTC (rev 18978) @@ -1,35 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> - - <display-name>Sample RichFaces 4 Application</display-name> - <context-param> - <param-name>javax.faces.PROJECT_STAGE</param-name> - <param-value>Development</param-value> - </context-param> - <context-param> - <param-name>javax.faces.SKIP_COMMENTS</param-name> - <param-value>true</param-value> - </context-param> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> - <welcome-file-list> - <welcome-file>faces/index.xhtml</welcome-file> - </welcome-file-list> - <session-config> - <session-timeout>30</session-timeout> - </session-config> -</web-app> \ No newline at end of file +<web-app version="2.5" 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"> + <display-name>Sample RichFaces 4 Application</display-name> + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + <context-param> + <param-name>javax.faces.SKIP_COMMENTS</param-name> + <param-value>true</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>30</session-timeout> + </session-config> + <mime-mapping> + <extension>ecss</extension> + <mime-type>text/css</mime-type> + </mime-mapping> + <welcome-file-list> + <welcome-file>faces/index.xhtml</welcome-file> + </welcome-file-list> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app>

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18977 - in trunk/examples/richfaces-showcase: src/main/webapp/WEB-INF and 1 other directory.

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

Author: jbalunas(a)redhat.com Date: 2010-08-25 17:59:45 -0400 (Wed, 25 Aug 2010) New Revision: 18977 Added: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml Modified: trunk/examples/richfaces-showcase/pom.xml Log: RFPL-772 Working around JBAS-8361 for richfaces-showcase Modified: trunk/examples/richfaces-showcase/pom.xml =================================================================== --- trunk/examples/richfaces-showcase/pom.xml 2010-08-25 20:08:18 UTC (rev 18976) +++ trunk/examples/richfaces-showcase/pom.xml 2010-08-25 21:59:45 UTC (rev 18977) @@ -281,12 +281,8 @@ <configuration> <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> <classifier>jee6</classifier> -  - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</warSourceExcludes> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes> <webResources> <resource> <directory>${basedir}/src/main/java</directory> @@ -362,21 +358,6 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> -  - <exclusions> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> Added: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-08-25 21:59:45 UTC (rev 18977) @@ -0,0 +1,11 @@ +<scanning xmlns="urn:jboss:scanning:1.0"> + + <path name="WEB-INF/classes"></path> + + <path name="WEB-INF/lib/guava-r05.jar"> + <exclude name="com.google.common.collect" /> + </path> +</scanning> \ No newline at end of file

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18976 - trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF.

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

Author: jbalunas(a)redhat.com Date: 2010-08-25 16:08:18 -0400 (Wed, 25 Aug 2010) New Revision: 18976 Modified: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml Log: Updated mime type mapping to avoid RF-8984 in showcase demo Modified: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-08-25 19:58:58 UTC (rev 18975) +++ trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-08-25 20:08:18 UTC (rev 18976) @@ -1,52 +1,58 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - id="richfaces-showcase" version="2.5"> - <display-name>richfaces-showcase</display-name> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - <welcome-file>index.htm</welcome-file> - <welcome-file>index.jsp</welcome-file> - <welcome-file>default.html</welcome-file> - <welcome-file>default.htm</welcome-file> - <welcome-file>default.jsp</welcome-file> - </welcome-file-list> - <context-param> - <param-name>javax.faces.FACELETS_LIBRARIES</param-name> - <param-value>/WEB-INF/app-tags.taglib.xml</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.enableControlSkinning</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.enableControlSkinningClasses</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.skin</param-name> - <param-value>#{skinBean.skin}</param-value> - </context-param> - <context-param> - <param-name>javax.faces.PROJECT_STAGE</param-name> - <param-value>Development</param-value> - </context-param> - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="richfaces-showcase" version="2.5" + 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"> + <display-name>richfaces-showcase</display-name> + <context-param> + <param-name>javax.faces.FACELETS_LIBRARIES</param-name> + <param-value>/WEB-INF/app-tags.taglib.xml</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinning</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinningClasses</param-name> + <param-value>false</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.skin</param-name> + <param-value>#{skinBean.skin}</param-value> + </context-param> + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <mime-mapping> + <extension>ecss</extension> + <mime-type>text/css</mime-type> + </mime-mapping> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app>

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18975 - trunk/examples/richfaces-showcase.

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

Author: jbalunas(a)redhat.com Date: 2010-08-25 15:58:58 -0400 (Wed, 25 Aug 2010) New Revision: 18975 Modified: trunk/examples/richfaces-showcase/pom.xml Log: Updated jee6 profile in showcase app, so default ee6 version runs on JBoss AS6 - RFPL-772 Modified: trunk/examples/richfaces-showcase/pom.xml =================================================================== --- trunk/examples/richfaces-showcase/pom.xml 2010-08-25 19:39:30 UTC (rev 18974) +++ trunk/examples/richfaces-showcase/pom.xml 2010-08-25 19:58:58 UTC (rev 18975) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> @@ -17,45 +18,47 @@ <packaging>war</packaging> <name>Richfaces Examples: Richfaces Showcase Application</name> - <properties> - </properties> + <properties> + </properties> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </dependency> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -87,7 +90,8 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector"> <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> @@ -126,13 +130,13 @@ <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> - <version>2.2</version> - </dependency> + <version>2.2</version> + </dependency> <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>2.2</version> - </dependency> + <version>2.2</version> + </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> @@ -277,8 +281,12 @@ <configuration> <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes> +  + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</warSourceExcludes> <webResources> <resource> <directory>${basedir}/src/main/java</directory> @@ -354,6 +362,21 @@ <dependencies> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> +  + <exclusions> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope>

14 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r18974 - in branches/RFPL-434: core/commons/src/main/java/org/richfaces/log and 1 other directory.

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

Author: nbelaevski Date: 2010-08-25 15:39:30 -0400 (Wed, 25 Aug 2010) New Revision: 18974 Modified: branches/RFPL-434/cdk/commons/src/main/java/org/richfaces/cdk/JavaLogger.java branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java Log: https://jira.jboss.org/browse/RFPL-434 Modified: branches/RFPL-434/cdk/commons/src/main/java/org/richfaces/cdk/JavaLogger.java =================================================================== --- branches/RFPL-434/cdk/commons/src/main/java/org/richfaces/cdk/JavaLogger.java 2010-08-25 19:14:48 UTC (rev 18973) +++ branches/RFPL-434/cdk/commons/src/main/java/org/richfaces/cdk/JavaLogger.java 2010-08-25 19:39:30 UTC (rev 18974) @@ -24,75 +24,138 @@ package org.richfaces.cdk; import java.util.logging.Level; +import java.util.logging.LogRecord; /** - * <p class="changed_added_4_0">That logger delegates all calls to the JDK {@link java.util.logging.Logger}</p> - * + * <p class="changed_added_4_0"> + * That logger delegates all calls to the JDK {@link java.util.logging.Logger} + * </p> + * * @author asmirnov(a)exadel.com */ public class JavaLogger implements Logger { - + public static final String CDK_LOG = "org.richfaces.cdk"; + private static final String CLASS_NAME = JavaLogger.class.getName(); + private int errorCount = 0; - + private java.util.logging.Logger jdkLogger = java.util.logging.Logger.getLogger(CDK_LOG); + private void fillCallerData(String fqn, LogRecord record) { + StackTraceElement[] stackTrace = new Exception().getStackTrace(); + + int i = 0; + + for (; i < stackTrace.length; i++) { + if (fqn.equals(stackTrace[i].getClassName())) { + break; + } + } + + int idx = i + 1; + + for (; idx < stackTrace.length; idx++) { + if (!fqn.equals(stackTrace[idx].getClassName())) { + break; + } + } + + if (idx < stackTrace.length) { + record.setSourceMethodName(stackTrace[idx].getMethodName()); + record.setSourceClassName(stackTrace[idx].getClassName()); + } + } + + private LogRecord createRecord(Level level, CharSequence message, Throwable thrown) { + // millis and thread are filled by the constructor + LogRecord record = new LogRecord(level, message != null ? message.toString() : null); + + // TODO resource bundle? + record.setLoggerName(jdkLogger.getName()); + record.setThrown(thrown); + fillCallerData(CLASS_NAME, record); + + return record; + } + /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#debug(java.lang.CharSequence) */ @Override public void debug(CharSequence content) { - jdkLogger.fine(String.valueOf(content)); + if (jdkLogger.isLoggable(Level.FINE)) { + jdkLogger.log(createRecord(Level.FINE, content, null)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#debug(java.lang.CharSequence, java.lang.Throwable) */ @Override public void debug(CharSequence content, Throwable error) { - jdkLogger.log(Level.FINE, String.valueOf(content), error); + if (jdkLogger.isLoggable(Level.FINE)) { + jdkLogger.log(createRecord(Level.FINE, content, error)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#debug(java.lang.Throwable) */ @Override public void debug(Throwable error) { - jdkLogger.log(Level.FINE, "", error); + if (jdkLogger.isLoggable(Level.FINE)) { + jdkLogger.log(createRecord(Level.FINE, "", error)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#error(java.lang.CharSequence) */ @Override public void error(CharSequence content) { errorCount++; - jdkLogger.severe(String.valueOf(content)); + + if (jdkLogger.isLoggable(Level.SEVERE)) { + jdkLogger.log(createRecord(Level.SEVERE, content, null)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#error(java.lang.CharSequence, java.lang.Throwable) */ @Override public void error(CharSequence content, Throwable error) { errorCount++; - jdkLogger.log(Level.SEVERE, String.valueOf(content), error); + + if (jdkLogger.isLoggable(Level.SEVERE)) { + jdkLogger.log(createRecord(Level.SEVERE, content, error)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#error(java.lang.Throwable) */ @Override public void error(Throwable error) { errorCount++; - jdkLogger.log(Level.SEVERE, "", error); + + if (jdkLogger.isLoggable(Level.SEVERE)) { + jdkLogger.log(createRecord(Level.SEVERE, "", error)); + } } @Override @@ -101,34 +164,44 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#info(java.lang.CharSequence) */ @Override public void info(CharSequence content) { - jdkLogger.info(String.valueOf(content)); + if (jdkLogger.isLoggable(Level.INFO)) { + jdkLogger.log(createRecord(Level.INFO, content, null)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#info(java.lang.CharSequence, java.lang.Throwable) */ @Override public void info(CharSequence content, Throwable error) { - jdkLogger.log(Level.INFO, String.valueOf(content), error); + if (jdkLogger.isLoggable(Level.INFO)) { + jdkLogger.log(createRecord(Level.INFO, content, error)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#info(java.lang.Throwable) */ @Override public void info(Throwable error) { - jdkLogger.log(Level.INFO, "", error); + if (jdkLogger.isLoggable(Level.INFO)) { + jdkLogger.log(createRecord(Level.INFO, "", error)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#isDebugEnabled() */ @Override @@ -137,7 +210,8 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#isErrorEnabled() */ @Override @@ -146,7 +220,8 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#isInfoEnabled() */ @Override @@ -155,7 +230,8 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#isWarnEnabled() */ @Override @@ -164,29 +240,38 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#warn(java.lang.CharSequence) */ @Override public void warn(CharSequence content) { - jdkLogger.warning(String.valueOf(content)); + if (jdkLogger.isLoggable(Level.WARNING)) { + jdkLogger.log(createRecord(Level.WARNING, content, null)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#warn(java.lang.CharSequence, java.lang.Throwable) */ @Override public void warn(CharSequence content, Throwable error) { - jdkLogger.log(Level.WARNING, String.valueOf(content), error); + if (jdkLogger.isLoggable(Level.WARNING)) { + jdkLogger.log(createRecord(Level.WARNING, content, error)); + } } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.Logger#warn(java.lang.Throwable) */ @Override public void warn(Throwable error) { - jdkLogger.log(Level.WARNING, "", error); + if (jdkLogger.isLoggable(Level.WARNING)) { + jdkLogger.log(createRecord(Level.WARNING, "", error)); + } } } Modified: branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java =================================================================== --- branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java 2010-08-25 19:14:48 UTC (rev 18973) +++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java 2010-08-25 19:39:30 UTC (rev 18974) @@ -87,9 +87,9 @@ } } - private LogRecord createRecord(Level level, CharSequence message, Throwable thrown) { + private LogRecord createRecord(java.util.logging.Level level, CharSequence message, Throwable thrown) { // millis and thread are filled by the constructor - LogRecord record = new LogRecord(LEVELS_MAP.get(level), message != null ? message.toString() : null); + LogRecord record = new LogRecord(level, message != null ? message.toString() : null); //TODO resource bundle? record.setLoggerName(jdkLogger.getName()); @@ -168,15 +168,24 @@ } public void log(Level level, CharSequence content) { - jdkLogger.log(createRecord(level, content, null)); + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, content, null)); + } } public void log(Level level, CharSequence content, Throwable thrown) { - jdkLogger.log(createRecord(level, content, thrown)); + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, content, thrown)); + } } public void log(Level level, Throwable thrown) { - jdkLogger.log(createRecord(level, null, thrown)); + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, null, thrown)); + } } }

14 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits August 2010