Author: nbelaevski Date: 2009-08-26 09:21:43 -0400 (Wed, 26 Aug 2009) New Revision: 15312 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java Log: https://jira.jboss.org/jira/browse/RF-7559 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -36,13 +36,12 @@ import org.ajax4jsf.component.AjaxViewRoot; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ViewIdHolder; -import org.ajax4jsf.context.ViewResources; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.webapp.BaseFilter; import org.ajax4jsf.webapp.FilterServletResponseWrapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** @@ -56,7 +55,7 @@ public static final String SERIALIZED_STATE_KEY = "org.ajax4jsf.view.serializedstate"; - private static final Log _log = LogFactory.getLog(AjaxViewHandler.class); + private static final Logger _log = RichfacesLogger.APPLICATION.getLogger(); public static final String VIEW_EXPIRED = "org.ajax4jsf.view.EXPIRED"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -29,8 +29,8 @@ import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author shura (latest modification by $Author: alexsmirnov $) @@ -46,7 +46,7 @@ private Lifecycle _default; - private static Log _log = LogFactory.getLog(DebugLifecycle.class); + private static Logger _log = RichfacesLogger.APPLICATION.getLogger(); public static final String DEBUG_LYFECYCLE_ID = "DEBUG"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -26,8 +26,8 @@ import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author shura (latest modification by $Author: alexsmirnov $) @@ -36,8 +36,7 @@ */ public class DebugLifecycleFactory extends LifecycleFactory { - private static final Log _log = LogFactory - .getLog(DebugLifecycleFactory.class); + private static final Logger _log = RichfacesLogger.APPLICATION.getLogger(); private LifecycleFactory _defaultFactory; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -35,8 +35,8 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxEvent; import org.ajax4jsf.event.AjaxListener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** @@ -62,7 +62,7 @@ // Private Fields - private static final Log log = LogFactory.getLog(AjaxRegionBrige.class); + private static final Logger log = RichfacesLogger.COMPONENTS.getLogger(); /** * Listener for call on Ajax Requests Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -52,8 +52,8 @@ import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.EventsQueue; import org.ajax4jsf.renderkit.AjaxContainerRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Custom ViewRoot for support render parts of tree for Ajax requests. Main @@ -74,7 +74,7 @@ private AjaxRegionBrige _brige; - private static final Log _log = LogFactory.getLog(AjaxViewRoot.class); + private static final Logger _log = RichfacesLogger.COMPONENTS.getLogger(); /** * Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -58,8 +58,8 @@ import org.ajax4jsf.model.ExtendedDataModel; import org.ajax4jsf.model.SerializableDataModel; import org.ajax4jsf.renderkit.AjaxChildrenRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Base class for iterable components, like dataTable, Tomahawk dataList, @@ -79,7 +79,7 @@ public final static DataModel EMPTY_MODEL = new ListDataModel( Collections.EMPTY_LIST); - private static final Log _log = LogFactory.getLog(UIDataAdaptor.class); + private static final Logger _log = RichfacesLogger.COMPONENTS.getLogger(); /** * Base class for visit data model at phases decode, validation and update Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -55,8 +55,8 @@ import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.renderkit.RendererUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * This class incapsulated @@ -69,7 +69,7 @@ public static final String SERVLET_ERROR_EXCEPTION_ATTRIBUTE = "javax.servlet.error.exception"; - private static final Log log = LogFactory.getLog(AjaxContext.class); + private static final Logger log = RichfacesLogger.CONTEXT.getLogger(); Set<String> ajaxAreasToRender = new LinkedHashSet<String>(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -21,11 +21,8 @@ package org.ajax4jsf.event; -import java.io.IOException; -import java.util.Iterator; import java.util.Map; -import javax.faces.FacesException; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; import javax.faces.event.PhaseEvent; @@ -34,9 +31,9 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.context.AjaxContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.richfaces.skin.SkinFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Listener for act before Render phase to set RenderKit Id for current skin. @@ -54,7 +51,7 @@ public static final String VIEW_BEAN_PREFIX = "org.ajax4jsf.viewbean:"; - private static final Log log = LogFactory.getLog(AjaxPhaseListener.class); + private static final Logger log = RichfacesLogger.APPLICATION.getLogger(); public static final String AJAX_BEAN_PREFIX = "org.ajax4jsf.ajaxviewbean:"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -34,8 +34,8 @@ import javax.faces.lifecycle.LifecycleFactory; import org.ajax4jsf.application.AjaxViewHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * One time called listener, for initialize framework at first request. @@ -44,10 +44,14 @@ */ public class InitPhaseListener implements PhaseListener { + /** + * + */ + private static final long serialVersionUID = 8389169240912928686L; private volatile boolean removed= false; private volatile boolean initialized = false; - private static final Log log = LogFactory.getLog(InitPhaseListener.class); + private static final Logger log = RichfacesLogger.APPLICATION.getLogger(); /* (non-Javadoc) * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent) Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -34,8 +34,8 @@ import org.ajax4jsf.component.AjaxChildrenEncoder; import org.ajax4jsf.component.AjaxOutput; import org.ajax4jsf.context.AjaxContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author shura @@ -44,7 +44,7 @@ public abstract class AjaxChildrenRenderer extends AjaxComponentRendererBase implements AjaxRenderer { - public static final Log log = LogFactory.getLog(AjaxChildrenRenderer.class); + private static final Logger log = RichfacesLogger.RENDERKIT.getLogger(); public static final String[] SPECIAL_COMPONENTS_TYPES = { "org.ajax4jsf.Bundle"/* UILoadBundle.COMPONENT_TYPE */, Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -33,8 +33,8 @@ import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Base renderer for all AJAX - subview components. @@ -65,7 +65,7 @@ public static final String AJAX_UPDATE_HEADER = "Ajax-Update-Ids"; - static final Log log = LogFactory.getLog(AjaxContainerRenderer.class); + private static final Logger log = RichfacesLogger.RENDERKIT.getLogger(); public static final String AJAX_FLAG_HEADER = "Ajax-Response"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -62,8 +62,8 @@ import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.ajax4jsf.util.ServicesUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author shura @@ -107,7 +107,7 @@ */ public static final String LIMITRENDER_ATTR_NAME = "limitRender"; - private static Log log = LogFactory.getLog(AjaxRendererUtils.class); + private static final Logger log = RichfacesLogger.RENDERKIT.getLogger(); public static final String AJAX_REGIONS_ATTRIBUTE = "reRender"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -30,8 +30,8 @@ import javax.faces.render.RenderKitFactory; 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 shura (latest modification by $Author: alexsmirnov $) @@ -46,8 +46,7 @@ // private static final String AJAX_RENDER_KIT_PARAMETER = // "AJAX_RENDER_KIT_ID"; - private static final Log _log = LogFactory - .getLog(ChameleonRenderKitFactory.class); + private static final Logger _log = RichfacesLogger.RENDERKIT.getLogger(); /** * @param defaultFactory Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -35,10 +35,10 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.resource.InternetResource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** @@ -54,7 +54,7 @@ * logger for common cases. */ protected static final String JAVASCRIPT_NAMESPACE = "Exadel"; - private static final Log log = LogFactory.getLog(RendererBase.class); + private static final Logger log = RichfacesLogger.RENDERKIT.getLogger(); private static final RendererUtils utils = RendererUtils.getInstance(); private SkinFactory skinFactory = null; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -30,9 +30,9 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.Messages; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; import org.richfaces.util.Util; +import org.slf4j.Logger; /** * Base class for all Html page resources - images, scripts, styles etc. Realise @@ -47,8 +47,7 @@ */ public abstract class InternetResourceBase implements InternetResource { - private static final Log log = LogFactory - .getLog(InternetResourceBase.class); + private static final Logger log = RichfacesLogger.RESOURCE.getLogger(); static final int BUFFER_SIZE = 1024; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -46,12 +46,11 @@ import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.BaseFilter; import org.ajax4jsf.webapp.WebXml; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; public class InternetResourceService { - private static final Log log = LogFactory - .getLog(InternetResourceService.class); + private static final Logger log = RichfacesLogger.RESOURCE.getLogger(); static final String ENABLE_CACHING_PARAMETER = "enable-cache"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -27,8 +27,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.util.RichfacesLogger; +import org.slf4j.Logger; /** * Base class for resources, rendered only one time in page ( JavaScript, CSS ) @@ -38,7 +38,7 @@ */ public abstract class OneTimeRenderer extends BaseResourceRenderer { - private static final Log log = LogFactory.getLog(OneTimeRenderer.class); + private static final Logger log = RichfacesLogger.RESOURCE.getLogger(); /* (non-Javadoc) * @see org.ajax4jsf.resource.BaseResourceRenderer#encodeBegin(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -35,8 +35,8 @@ import javax.faces.lifecycle.LifecycleFactory; import javax.faces.render.RenderKitFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Lifecycle for simulate faces request processing for resource. @@ -49,7 +49,7 @@ private Lifecycle lifecycle; - private static final Log _log = LogFactory.getLog(ResourceLifecycle.class); + private static final Logger _log = RichfacesLogger.RESOURCE.getLogger(); /* * (non-Javadoc) Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -27,10 +27,8 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.javascript.JSMin; -import org.ajax4jsf.resource.InternetResource; -import org.ajax4jsf.resource.ResourceContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -41,7 +39,7 @@ private static final String COMPRESS_SCRIPTS_PARAMETER = "org.ajax4jsf.COMPRESS_SCRIPT"; - private static final Log _log = LogFactory.getLog(ScriptRenderer.class); + private static final Logger _log = RichfacesLogger.RESOURCE.getLogger(); /* (non-Javadoc) * @see org.ajax4jsf.resource.BaseResourceRenderer#send(org.ajax4jsf.resource.InternetResource, org.ajax4jsf.resource.ResourceContext) Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -50,9 +50,9 @@ import org.ajax4jsf.renderkit.AjaxContainerRenderer; import org.ajax4jsf.request.MultipartRequest; import org.ajax4jsf.resource.InternetResourceService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.richfaces.component.FileUploadConstants; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Base class for request processing filters, with convert Htmp content to XML @@ -70,7 +70,7 @@ public static final String AJAX_PUSH_KEY_HEADER = "Ajax-Push-Key"; - private static final Log log = LogFactory.getLog(BaseFilter.class); + private static final Logger log = RichfacesLogger.WEBAPP.getLogger(); public static final boolean DEBUG = true; @@ -153,7 +153,7 @@ parameters.append(name).append(" : '").append( config.getInitParameter(name)).append('\n'); } - log.debug(parameters); + log.debug(parameters.toString()); // log.debug("Stack Trace", new Exception()); } // Save config Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -42,13 +42,13 @@ import org.ajax4jsf.application.AjaxViewHandler; import org.ajax4jsf.context.ContextInitParameters; import org.ajax4jsf.renderkit.AjaxContainerRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; public abstract class BaseXMLFilter { public static final String AJAX_EXPIRED = "Ajax-Expired"; - private static final Log log = LogFactory.getLog(BaseXMLFilter.class); + private static final Logger log = RichfacesLogger.WEBAPP.getLogger(); public static final String APPLICATION_SCOPE_KEY = BaseXMLFilter.class.getName(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -37,9 +37,9 @@ import org.ajax4jsf.io.FastBufferOutputStream; import org.ajax4jsf.io.FastBufferWriter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; import org.richfaces.util.Util; +import org.slf4j.Logger; /** * @author shura (latest modification by $Author: alexsmirnov $) @@ -52,7 +52,7 @@ */ private static final long serialVersionUID = 8120940486890871177L; - private static final Log _log = LogFactory.getLog(CacheContent.class); + private static final Logger _log = RichfacesLogger.WEBAPP.getLogger(); // private transient ByteArrayOutputStream outputStream ; private transient FastBufferOutputStream outputStream; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -57,8 +57,8 @@ import org.ajax4jsf.io.FastBufferOutputStream; import org.ajax4jsf.io.FastBufferReader; import org.ajax4jsf.io.FastBufferWriter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; import org.xml.sax.InputSource; /** @@ -69,7 +69,7 @@ */ public class FilterServletResponseWrapper extends HttpServletResponseWrapper { - private static final Log log = LogFactory.getLog(FilterServletResponseWrapper.class); + private static final Logger log = RichfacesLogger.WEBAPP.getLogger(); public static final String DEFAULT_ENCODING = "UTF-8"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -29,10 +29,10 @@ import javax.servlet.http.HttpServletRequest; import org.ajax4jsf.config.WebXMLParser; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.richfaces.VersionBean; import org.richfaces.VersionBean.Version; +import org.richfaces.util.RichfacesLogger; +import org.slf4j.Logger; /** * Parse at startup application web.xml and store servlet and filter mappings. @@ -51,7 +51,7 @@ */ private static final long serialVersionUID = -9042908418843695017L; - static final Log _log = LogFactory.getLog(WebXml.class); + static final Logger _log = RichfacesLogger.WEBAPP.getLogger(); public static final String RESOURCE_URI_PREFIX = "a4j"; Modified: root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java 2009-08-26 13:02:34 UTC (rev 15311) +++ root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java 2009-08-26 13:21:43 UTC (rev 15312) @@ -20,8 +20,14 @@ APPLICATION("Application"), - CACHE("Cache"); + CACHE("Cache"), + CONTEXT("Context"), + + COMPONENTS("Components"), + + WEBAPP("Webapp"); + private static final String LOGGER_NAME_PREFIX = "org.richfaces.log."; private String loggerName;