Merged V2.1 to HEAD

6694: Removal of explicit Log4J usage


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-11 04:32:56 +00:00
parent ac03bb5f8c
commit 6936c6e642
15 changed files with 52 additions and 37 deletions

View File

@@ -38,7 +38,8 @@ import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.FacesEvent;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.alfresco.web.app.Application;
import org.alfresco.web.data.IDataContainer;
@@ -50,7 +51,7 @@ import org.alfresco.web.ui.common.WebResources;
*/
public class UIDataPager extends UICommand
{
private static Logger s_logger = Logger.getLogger(IDataContainer.class);
private static Log s_logger = LogFactory.getLog(IDataContainer.class);
private static final String LAST_PAGE = "last_page";
private static final String NEXT_PAGE = "next_page";

View File

@@ -37,7 +37,8 @@ import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.FacesEvent;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.alfresco.web.data.IDataContainer;
import org.alfresco.web.ui.common.Utils;
@@ -336,7 +337,7 @@ public class UISortLink extends UICommand
// ------------------------------------------------------------------------------
// Constants
private static Logger s_logger = Logger.getLogger(IDataContainer.class);
private static Log s_logger = LogFactory.getLog(IDataContainer.class);
/** sorting mode */
private String mode = IDataContainer.SORT_CASEINSENSITIVE;

View File

@@ -29,7 +29,8 @@ import java.io.IOException;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.alfresco.web.ui.common.component.SelfRenderingComponent;
@@ -137,7 +138,7 @@ public abstract class BaseEvaluator extends SelfRenderingComponent
public abstract boolean evaluate();
protected static final Logger s_logger = Logger.getLogger(BaseEvaluator.class);
protected static final Log s_logger = LogFactory.getLog(BaseEvaluator.class);
/** the value to be evaluated against */
private Object value;