Author: nbelaevski Date: 2009-08-26 09:02:34 -0400 (Wed, 26 Aug 2009) New Revision: 15311 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/LRUMapCacheFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java Log: https://jira.jboss.org/jira/browse/RF-7559 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -28,15 +28,16 @@ import java.util.Properties; import org.ajax4jsf.resource.util.URLToStreamHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * CacheManager is used in J2SE environments for looking up named caches. */ //TODO stop caches on application stop public class CacheManager { - private static final Log log = LogFactory.getLog(CacheManager.class); + + private static final Logger log = RichfacesLogger.CACHE.getLogger(); private static final String FACTORY_PROPERTY_NAME = "org.ajax4jsf.cache.CacheFactory"; public static final String CACHE_MANAGER_FACTORY_CLASS = "org.ajax4jsf.cache.CACHE_MANAGER_FACTORY_CLASS"; @@ -121,7 +122,7 @@ return s == null || "".equals(s); } - String findFactory(String factoryId, Map env) { + String findFactory(String factoryId, Map<?, ?> env) { String envFactoryClass = (String) env.get(CACHE_MANAGER_FACTORY_CLASS); if (!isEmptyString(envFactoryClass)) return envFactoryClass; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -5,8 +5,8 @@ import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author Nick Belaevski @@ -14,7 +14,7 @@ */ public class EhCacheCacheFactory implements CacheFactory { - private static final Log log = LogFactory.getLog(EhCacheCacheFactory.class); + private static final Logger log = RichfacesLogger.CACHE.getLogger(); public Cache createCache(Map<?, ?> env) { log.info("Creating EhCache cache instance"); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/LRUMapCacheFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/LRUMapCacheFactory.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/LRUMapCacheFactory.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -23,8 +23,8 @@ import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** @@ -34,7 +34,7 @@ */ public class LRUMapCacheFactory implements CacheFactory { - private static final Log log = LogFactory.getLog(LRUMapCacheFactory.class); + private static final Logger log = RichfacesLogger.CACHE.getLogger(); public final static String CACHE_SIZE_PARAMETER = "org.ajax4jsf.cache.LRU_MAP_CACHE_SIZE"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -28,8 +28,8 @@ import java.util.Properties; import org.ajax4jsf.resource.util.URLToStreamHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; import com.opensymphony.oscache.general.GeneralCacheAdministrator; @@ -40,7 +40,7 @@ */ public class OSCacheCacheFactory implements CacheFactory { - private static final Log log = LogFactory.getLog(OSCacheCacheFactory.class); + private static final Logger log = RichfacesLogger.CACHE.getLogger(); private Properties loadProperties(URL url) throws IOException { Properties properties = new Properties(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -43,12 +43,11 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; -import javax.faces.el.ValueBinding; import javax.faces.model.SelectItem; import org.ajax4jsf.Messages; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author Maksim Kaszynski @@ -56,7 +55,7 @@ */ public class SelectUtils { - private static final Log log = LogFactory.getLog(SelectUtils.class); + private static final Logger log = RichfacesLogger.APPLICATION.getLogger(); /** * Gathers all select items from specified component's children Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -31,8 +31,8 @@ import javax.faces.FacesException; import org.ajax4jsf.resource.util.URLToStreamHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author shura @@ -40,7 +40,7 @@ */ public class ServicesUtils { - private static final Log log = LogFactory.getLog(ServicesUtils.class); + private static final Logger log = RichfacesLogger.APPLICATION.getLogger(); private static Map<String, Map<ClassLoader, Class<?>>> _services = Collections.synchronizedMap(new HashMap<String, Map<ClassLoader, Class<?>>>()); Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -38,13 +38,12 @@ import javax.faces.application.Application; import javax.faces.application.ApplicationFactory; import javax.faces.context.FacesContext; -import javax.faces.el.ReferenceSyntaxException; import org.ajax4jsf.Messages; import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.util.ELUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Implementation of {@link SkinFactory} with building skins from properties @@ -102,7 +101,7 @@ private ValueExpression skinBinding = null; private String baseSkinName = null; private ValueExpression baseSkinBinding = null; - private static final Log log = LogFactory.getLog(SkinFactoryImpl.class); + private static final Logger log = RichfacesLogger.APPLICATION.getLogger(); private static final String A4J_BASE_SKIN_PARAMETER = "org.ajax4jsf.BASE_SKIN"; @@ -298,7 +297,6 @@ * @return * @throws SkinNotFoundException * @throws FacesException - * @throws ReferenceSyntaxException */ protected Properties loadProperties(String name, String[] paths) throws SkinNotFoundException, FacesException { ClassLoader loader = getClassLoader(); Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -27,9 +27,8 @@ import javax.faces.el.PropertyResolver; import org.ajax4jsf.Messages; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.richfaces.skin.Skin; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Resolve Skin propertyes. @@ -39,7 +38,7 @@ */ public class SkinPropertyResolver extends PropertyResolver { - private static final Log log = LogFactory.getLog(SkinPropertyResolver.class); + private static final Logger log = RichfacesLogger.APPLICATION.getLogger(); private PropertyResolver parent = null; /** Modified: root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2009-08-26 12:41:39 UTC (rev 15310) +++ root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2009-08-26 13:02:34 UTC (rev 15311) @@ -35,8 +35,6 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.component.UIDataAdaptor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * @author Maksim Kaszynski @@ -44,8 +42,6 @@ */ public abstract class UIComponentELTagBase extends UIComponentELTag { - private static final Log log = LogFactory.getLog(UIComponentELTagBase.class); - protected void setActionListenerProperty(UIComponent component, MethodExpression actionListener) { if (actionListener != null) { if (component instanceof ActionSource2) {