[richfaces-svn-commits] JBoss Rich Faces SVN: r15315 - in root/framework/trunk: api/src/main/java/org/ajax4jsf/application and 7 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Aug 26 09:36:01 EDT 2009
Author: nbelaevski
Date: 2009-08-26 09:36:01 -0400 (Wed, 26 Aug 2009)
New Revision: 15315
Added:
root/framework/trunk/api/src/main/java/org/richfaces/log/
Removed:
root/framework/trunk/impl/src/main/java/org/richfaces/log/
Modified:
root/framework/trunk/api/pom.xml
root/framework/trunk/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java
root/framework/trunk/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java
root/framework/trunk/api/src/main/java/org/richfaces/log/RichfacesLogger.java
root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java
root/framework/trunk/impl/pom.xml
root/framework/trunk/version-matrix/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-7559
Modified: root/framework/trunk/api/pom.xml
===================================================================
--- root/framework/trunk/api/pom.xml 2009-08-26 13:28:21 UTC (rev 15314)
+++ root/framework/trunk/api/pom.xml 2009-08-26 13:36:01 UTC (rev 15315)
@@ -22,6 +22,15 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
Modified: root/framework/trunk/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java
===================================================================
--- root/framework/trunk/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2009-08-26 13:28:21 UTC (rev 15314)
+++ root/framework/trunk/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2009-08-26 13:36:01 UTC (rev 15315)
@@ -31,8 +31,8 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.richfaces.log.RichfacesLogger;
+import org.slf4j.Logger;
/**
* Base wrapper for {@link javax.faces.application.ViewHandler} . By default, delegate all
@@ -45,7 +45,7 @@
public class ViewHandlerWrapper extends ViewHandler {
private static final String HANDLERS = "org.ajax4jsf.VIEW_HANDLERS";
- private static final Log _log = LogFactory.getLog(ViewHandlerWrapper.class);
+ private static final Logger _log = RichfacesLogger.APPLICATION.getLogger();
/**
* Wrapped ViewHandler
Modified: root/framework/trunk/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java
===================================================================
--- root/framework/trunk/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2009-08-26 13:28:21 UTC (rev 15314)
+++ root/framework/trunk/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2009-08-26 13:36:01 UTC (rev 15315)
@@ -26,8 +26,8 @@
import java.net.URL;
import java.net.URLConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.richfaces.log.RichfacesLogger;
+import org.slf4j.Logger;
/**
* Utility class to solve JAR locking issue using {@link URLConnection#setUseCaches(boolean)} method.
@@ -40,7 +40,7 @@
public final class URLToStreamHelper {
- private static final Log log = LogFactory.getLog(URLToStreamHelper.class);
+ private static final Logger log = RichfacesLogger.UTIL.getLogger();
private URLToStreamHelper() {
super();
Copied: root/framework/trunk/api/src/main/java/org/richfaces/log (from rev 15314, root/framework/trunk/impl/src/main/java/org/richfaces/log)
Modified: root/framework/trunk/api/src/main/java/org/richfaces/log/RichfacesLogger.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/log/RichfacesLogger.java 2009-08-26 13:28:21 UTC (rev 15314)
+++ root/framework/trunk/api/src/main/java/org/richfaces/log/RichfacesLogger.java 2009-08-26 13:36:01 UTC (rev 15315)
@@ -26,8 +26,10 @@
COMPONENTS("Components"),
- WEBAPP("Webapp");
+ WEBAPP("Webapp"),
+ UTIL("Util");
+
private static final String LOGGER_NAME_PREFIX = "org.richfaces.log.";
private String loggerName;
Modified: root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java
===================================================================
--- root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java 2009-08-26 13:28:21 UTC (rev 15314)
+++ root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java 2009-08-26 13:36:01 UTC (rev 15315)
@@ -36,8 +36,8 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.resource.util.URLToStreamHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.richfaces.log.RichfacesLogger;
+import org.slf4j.Logger;
/**
* Base factory class ( implement Singleton design pattern ). Produce self
@@ -56,9 +56,8 @@
private static Map<ClassLoader, SkinFactory> instances =
Collections.synchronizedMap(new HashMap<ClassLoader, SkinFactory>());
- private static final Log log = LogFactory.getLog(SkinFactory.class);
+ private static final Logger log = RichfacesLogger.APPLICATION.getLogger();
-
public static void reset() {
instances = Collections.synchronizedMap(new HashMap<ClassLoader, SkinFactory>());
}
Modified: root/framework/trunk/impl/pom.xml
===================================================================
--- root/framework/trunk/impl/pom.xml 2009-08-26 13:28:21 UTC (rev 15314)
+++ root/framework/trunk/impl/pom.xml 2009-08-26 13:36:01 UTC (rev 15315)
@@ -132,10 +132,6 @@
<artifactId>richfaces-test-base</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>opensymphony</groupId>
<artifactId>oscache</artifactId>
<optional>true</optional>
@@ -162,10 +158,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
Modified: root/framework/trunk/version-matrix/pom.xml
===================================================================
--- root/framework/trunk/version-matrix/pom.xml 2009-08-26 13:28:21 UTC (rev 15314)
+++ root/framework/trunk/version-matrix/pom.xml 2009-08-26 13:36:01 UTC (rev 15315)
@@ -236,11 +236,6 @@
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
<!-- -->
<!-- TODO: legacy dependnecies -->
More information about the richfaces-svn-commits
mailing list