diff --git a/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java b/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java index fabd98d6e..2233375f6 100644 --- a/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java +++ b/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java @@ -21,14 +21,20 @@ package mailreader2; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import java.io.*; + +import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase; + +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** *

ServletContextListener that initializes and finalizes the @@ -94,7 +100,7 @@ public final class ApplicationListener implements ServletContextListener { /** *

Logging output for this plug in instance.

*/ - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); // ------------------------------------------------------------- Properties diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java index 50ca23a5c..02bad38bf 100644 --- a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java +++ b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java @@ -21,18 +21,20 @@ package mailreader2; -import org.apache.struts2.interceptor.ApplicationAware; -import org.apache.struts2.interceptor.SessionAware; -import com.opensymphony.xwork2.ActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.util.Map; + import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException; import org.apache.struts.apps.mailreader.dao.Subscription; import org.apache.struts.apps.mailreader.dao.User; import org.apache.struts.apps.mailreader.dao.UserDatabase; import org.apache.struts.apps.mailreader.dao.impl.memory.MemorySubscription; import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUser; -import java.util.Map; +import org.apache.struts2.interceptor.ApplicationAware; +import org.apache.struts2.interceptor.SessionAware; + +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** *

Base Action for MailreaderSupport application.

@@ -386,7 +388,7 @@ public class MailreaderSupport extends ActionSupport /** *

Log instance for this application.

*/ - protected Log log = LogFactory.getLog(Constants.PACKAGE); + protected Logger log = LoggerFactory.getLogger(Constants.PACKAGE); /** *

Persist the User object, including subscriptions, to the database. diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java index 281f67347..14a7cbeaf 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java @@ -21,20 +21,20 @@ package org.apache.struts2.showcase.chat; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.dispatcher.SessionMap; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; public class ChatAuthenticationInterceptor implements Interceptor { private static final long serialVersionUID = 1L; - private static final Log _log = LogFactory.getLog(ChatAuthenticationInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(ChatAuthenticationInterceptor.class); public static final String USER_SESSION_KEY = "chatUserSessionKey"; @@ -46,7 +46,7 @@ public class ChatAuthenticationInterceptor implements Interceptor { public String intercept(ActionInvocation invocation) throws Exception { - _log.debug("Authenticating chat user"); + LOG.debug("Authenticating chat user"); SessionMap session = (SessionMap) ActionContext.getContext().get(ActionContext.SESSION); User user = (User) session.get(USER_SESSION_KEY); diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java index 4e9afbda0..83d0c225c 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java @@ -22,20 +22,19 @@ package org.apache.struts2.showcase.chat; import javax.servlet.http.HttpSession; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Authenticate showcase chat example, make sure everyone have a username. */ public class ChatInterceptor implements Interceptor { - private static final Log _log = LogFactory.getLog(ChatInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(ChatInterceptor.class); private static final long serialVersionUID = 1L; @@ -51,7 +50,7 @@ public class ChatInterceptor implements Interceptor { HttpSession session = (HttpSession) ActionContext.getContext().get(ActionContext.SESSION); User chatUser = (User) session.getAttribute(CHAT_USER_SESSION_KEY); if (chatUser == null) { - _log.debug("Chat user not logged in"); + LOG.debug("Chat user not logged in"); return Action.LOGIN; } return invocation.invoke(); diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java index 0e6d430fe..db3961c8d 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java @@ -24,14 +24,15 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + public class ChatSessionListener implements HttpSessionListener { - private static final Log _log = LogFactory.getLog(ChatSessionListener.class); + private static final Logger LOG = LoggerFactory.getLogger(ChatSessionListener.class); public void sessionCreated(HttpSessionEvent event) { } @@ -45,7 +46,7 @@ public class ChatSessionListener implements HttpSessionListener { ChatService service = (ChatService) context.getBean("chatService"); service.logout(user.getName()); - _log.info("session expired, logged user ["+user.getName()+"] out"); + LOG.info("session expired, logged user ["+user.getName()+"] out"); } } } diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java index 72b707813..3ebb41831 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java @@ -25,13 +25,14 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.util.StrutsTypeConverter; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + public class DateConverter extends StrutsTypeConverter { - private static final Log _log = LogFactory.getLog(DateConverter.class); + private static final Logger LOG = LoggerFactory.getLogger(DateConverter.class); public Object convertFromString(Map context, String[] values, Class toClass) { @@ -41,7 +42,7 @@ public class DateConverter extends StrutsTypeConverter { return sdf.parse(values[0]); } catch(ParseException e) { - _log.error("error converting value ["+values[0]+"] to Date ", e); + LOG.error("error converting value ["+values[0]+"] to Date ", e); } } return null; diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java index dc136db42..7b0389306 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java +++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java @@ -31,8 +31,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.PageContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.Dispatcher; @@ -47,6 +45,8 @@ import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -116,7 +116,7 @@ import com.opensymphony.xwork2.util.ValueStackFactory; */ @StrutsTag(name="action", tldTagClass="org.apache.struts2.views.jsp.ActionTag", description="Execute an action from within a view") public class ActionComponent extends ContextBean { - private static final Log LOG = LogFactory.getLog(ActionComponent.class); + private static final Logger LOG = LoggerFactory.getLogger(ActionComponent.class); protected HttpServletResponse res; protected HttpServletRequest req; diff --git a/core/src/main/java/org/apache/struts2/components/AppendIterator.java b/core/src/main/java/org/apache/struts2/components/AppendIterator.java index 8197b0dca..4f352657c 100644 --- a/core/src/main/java/org/apache/struts2/components/AppendIterator.java +++ b/core/src/main/java/org/apache/struts2/components/AppendIterator.java @@ -25,15 +25,15 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.components.Param.UnnamedParametric; import org.apache.struts2.util.AppendIteratorFilter; import org.apache.struts2.util.MakeIterator; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -118,7 +118,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name="append", tldTagClass="org.apache.struts2.views.jsp.iterator.AppendIteratorTag", description="Append the values of a list of iterators to one iterator") public class AppendIterator extends ContextBean implements UnnamedParametric { - private static final Log _log = LogFactory.getLog(AppendIterator.class); + private static final Logger LOG = LoggerFactory.getLogger(AppendIterator.class); private AppendIteratorFilter appendIteratorFilter= null; private List _parameters; @@ -140,7 +140,7 @@ public class AppendIterator extends ContextBean implements UnnamedParametric { Object iteratorEntryObj = paramEntries.next(); if (! MakeIterator.isIterable(iteratorEntryObj)) { - _log.warn("param with value resolved as "+iteratorEntryObj+" cannot be make as iterator, it will be ignored and hence will not appear in the merged iterator"); + LOG.warn("param with value resolved as "+iteratorEntryObj+" cannot be make as iterator, it will be ignored and hence will not appear in the merged iterator"); continue; } appendIteratorFilter.setSource(MakeIterator.convert(iteratorEntryObj)); diff --git a/core/src/main/java/org/apache/struts2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java index 6f39640a2..9c3644f08 100644 --- a/core/src/main/java/org/apache/struts2/components/Bean.java +++ b/core/src/main/java/org/apache/struts2/components/Bean.java @@ -22,15 +22,15 @@ package org.apache.struts2.components; import java.io.Writer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; +import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; /** @@ -96,7 +96,7 @@ import com.opensymphony.xwork2.util.reflection.ReflectionProvider; @StrutsTag(name="bean", tldTagClass="org.apache.struts2.views.jsp.BeanTag", description="Instantiate a JavaBean and place it in the context") public class Bean extends ContextBean { - protected static Log log = LogFactory.getLog(Bean.class); + protected static Logger LOG = LoggerFactory.getLogger(Bean.class); protected Object bean; protected String name; @@ -126,7 +126,7 @@ public class Bean extends ContextBean { String beanName = findString(name, "name", "Bean name is required. Example: com.acme.FooBean"); bean = objectFactory.buildBean(ClassLoaderUtil.loadClass(beanName, getClass()), stack.getContext()); } catch (Exception e) { - log.error("Could not instantiate bean", e); + LOG.error("Could not instantiate bean", e); return false; } diff --git a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java index 86a92abf4..2db8886e7 100644 --- a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java @@ -25,17 +25,17 @@ import java.io.Writer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * ClosingUIBean is the standard superclass for UI components such as div etc. */ public abstract class ClosingUIBean extends UIBean { - private static final Log LOG = LogFactory.getLog(ClosingUIBean.class); + private static final Logger LOG = LoggerFactory.getLogger(ClosingUIBean.class); protected ClosingUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java index 45b56ee30..070924139 100644 --- a/core/src/main/java/org/apache/struts2/components/Date.java +++ b/core/src/main/java/org/apache/struts2/components/Date.java @@ -29,14 +29,14 @@ import java.util.Calendar; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.TextProvider; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -142,7 +142,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name="date", tldBodyContent="empty", tldTagClass="org.apache.struts2.views.jsp.DateTag", description="Render a formatted date.") public class Date extends ContextBean { - private static final Log LOG = LogFactory.getLog(Date.class); + private static final Logger LOG = LoggerFactory.getLogger(Date.class); /** * Property name to fall back when no format is specified */ diff --git a/core/src/main/java/org/apache/struts2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java index 1636dadd1..915f85455 100644 --- a/core/src/main/java/org/apache/struts2/components/File.java +++ b/core/src/main/java/org/apache/struts2/components/File.java @@ -23,12 +23,12 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -51,7 +51,7 @@ import com.opensymphony.xwork2.util.ValueStack; description="Render a file input field", allowDynamicAttributes=true) public class File extends UIBean { - private final static Log log = LogFactory.getLog(File.class); + private final static Logger LOG = LoggerFactory.getLogger(File.class); final public static String TEMPLATE = "file"; @@ -74,13 +74,13 @@ public class File extends UIBean { String encType = (String) form.getParameters().get("enctype"); if (!"multipart/form-data".equals(encType)) { // uh oh, this isn't good! Let's warn the developer - log.warn("Struts has detected a file upload UI tag (s:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!"); + LOG.warn("Struts has detected a file upload UI tag (s:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!"); } String method = (String) form.getParameters().get("method"); if (!"post".equalsIgnoreCase(method)) { // uh oh, this isn't good! Let's warn the developer - log.warn("Struts has detected a file upload UI tag (s:file) being used without a form set to method 'POST'. This is probably an error!"); + LOG.warn("Struts has detected a file upload UI tag (s:file) being used without a form set to method 'POST'. This is probably an error!"); } } diff --git a/core/src/main/java/org/apache/struts2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java index dfb059eed..d444535ee 100644 --- a/core/src/main/java/org/apache/struts2/components/Include.java +++ b/core/src/main/java/org/apache/struts2/components/Include.java @@ -40,16 +40,16 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.RequestUtils; import org.apache.struts2.StrutsConstants; import org.apache.struts2.util.FastByteArrayOutputStream; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -97,7 +97,7 @@ import com.opensymphony.xwork2.util.ValueStack; "(result of servlet or a JSP page)") public class Include extends Component { - private static final Log _log = LogFactory.getLog(Include.class); + private static final Logger LOG = LoggerFactory.getLogger(Include.class); private static String encoding; private static boolean encodingDefined = true; @@ -147,7 +147,7 @@ public class Include extends Component { try { urlBuf.append(URLEncoder.encode(values.get(i).toString(), "UTF-8")); } catch (Exception e) { - _log.warn("unable to url-encode "+values.get(i).toString()+", it will be ignored"); + LOG.warn("unable to url-encode "+values.get(i).toString()+", it will be ignored"); } concat = "&"; @@ -161,7 +161,7 @@ public class Include extends Component { try { include(result, writer, req, res); } catch (Exception e) { - LogFactory.getLog(getClass()).warn("Exception thrown during include of " + result, e); + LOG.warn("Exception thrown during include of " + result, e); } return super.end(writer, body); diff --git a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java index ccad62b1c..f27e4ec57 100644 --- a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java @@ -20,16 +20,18 @@ */ package org.apache.struts2.components; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.util.ValueStack; +import java.util.LinkedHashMap; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Map; -import java.util.LinkedHashMap; + +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; + +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -72,7 +74,7 @@ import java.util.LinkedHashMap; @StrutsTag(name="inputtransferselect", tldTagClass="org.apache.struts2.views.jsp.ui.InputTransferSelectTag", description="Renders an input form") public class InputTransferSelect extends ListUIBean { - private static final Log _log = LogFactory.getLog(InputTransferSelect.class); + private static final Logger LOG = LoggerFactory.getLogger(InputTransferSelect.class); private static final String TEMPLATE = "inputtransferselect"; @@ -198,7 +200,7 @@ public class InputTransferSelect extends ListUIBean { } else { - _log.warn("form enclosing inputtransferselect "+this+" not found, auto select upon form submit of inputtransferselect will not work"); + LOG.warn("form enclosing inputtransferselect "+this+" not found, auto select upon form submit of inputtransferselect will not work"); } } diff --git a/core/src/main/java/org/apache/struts2/components/MergeIterator.java b/core/src/main/java/org/apache/struts2/components/MergeIterator.java index 3484f3b62..48176753a 100644 --- a/core/src/main/java/org/apache/struts2/components/MergeIterator.java +++ b/core/src/main/java/org/apache/struts2/components/MergeIterator.java @@ -25,15 +25,15 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.components.Param.UnnamedParametric; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.util.MergeIteratorFilter; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -132,7 +132,7 @@ import com.opensymphony.xwork2.util.ValueStack; "of a list of iterators into one iterator") public class MergeIterator extends ContextBean implements UnnamedParametric { - private static final Log _log = LogFactory.getLog(MergeIterator.class); + private static final Logger LOG = LoggerFactory.getLogger(MergeIterator.class); private MergeIteratorFilter mergeIteratorFilter = null; private List _parameters; @@ -154,7 +154,7 @@ public class MergeIterator extends ContextBean implements UnnamedParametric { for (Iterator parametersIterator = _parameters.iterator(); parametersIterator.hasNext(); ) { Object iteratorEntryObj = parametersIterator.next(); if (! MakeIterator.isIterable(iteratorEntryObj)) { - _log.warn("param with value resolved as "+iteratorEntryObj+" cannot be make as iterator, it will be ignored and hence will not appear in the merged iterator"); + LOG.warn("param with value resolved as "+iteratorEntryObj+" cannot be make as iterator, it will be ignored and hence will not appear in the merged iterator"); continue; } mergeIteratorFilter.setSource(MakeIterator.convert(iteratorEntryObj)); diff --git a/core/src/main/java/org/apache/struts2/components/OptGroup.java b/core/src/main/java/org/apache/struts2/components/OptGroup.java index 466de25af..20b9df167 100644 --- a/core/src/main/java/org/apache/struts2/components/OptGroup.java +++ b/core/src/main/java/org/apache/struts2/components/OptGroup.java @@ -27,14 +27,14 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -79,7 +79,7 @@ public class OptGroup extends Component { public static final String INTERNAL_LIST_UI_BEAN_LIST_PARAMETER_KEY = "optGroupInternalListUiBeanList"; - private static Log _log = LogFactory.getLog(OptGroup.class); + private static Logger LOG = LoggerFactory.getLogger(OptGroup.class); protected HttpServletRequest req; protected HttpServletResponse res; @@ -105,7 +105,7 @@ public class OptGroup extends Component { public boolean end(Writer writer, String body) { Select select = (Select) findAncestor(Select.class); if (select == null) { - _log.error("incorrect use of OptGroup component, this component must be used within a Select component", + LOG.error("incorrect use of OptGroup component, this component must be used within a Select component", new IllegalStateException("incorrect use of OptGroup component, this component must be used within a Select component")); return false; } diff --git a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java index 09d671245..29b51f16d 100644 --- a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java @@ -26,12 +26,12 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -95,7 +95,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name="optiontransferselect", tldTagClass="org.apache.struts2.views.jsp.ui.OptionTransferSelectTag", description="Renders an input form") public class OptionTransferSelect extends DoubleListUIBean { - private static final Log _log = LogFactory.getLog(OptionTransferSelect.class); + private static final Logger LOG = LoggerFactory.getLogger(OptionTransferSelect.class); private static final String TEMPLATE = "optiontransferselect"; @@ -331,7 +331,7 @@ public class OptionTransferSelect extends DoubleListUIBean { } else { - _log.warn("form enclosing optiontransferselect "+this+" not found, auto select upon form submit of optiontransferselect will not work"); + LOG.warn("form enclosing optiontransferselect "+this+" not found, auto select upon form submit of optiontransferselect will not work"); } } diff --git a/core/src/main/java/org/apache/struts2/components/Property.java b/core/src/main/java/org/apache/struts2/components/Property.java index 24b479d5d..d582582cd 100644 --- a/core/src/main/java/org/apache/struts2/components/Property.java +++ b/core/src/main/java/org/apache/struts2/components/Property.java @@ -23,13 +23,13 @@ package org.apache.struts2.components; import java.io.IOException; import java.io.Writer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.TextUtils; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -89,7 +89,7 @@ import com.opensymphony.xwork2.util.TextUtils; @StrutsTag(name="property", tldBodyContent="empty", tldTagClass="org.apache.struts2.views.jsp.PropertyTag", description="Print out expression which evaluates against the stack") public class Property extends Component { - private static final Log LOG = LogFactory.getLog(Property.class); + private static final Logger LOG = LoggerFactory.getLogger(Property.class); public Property(ValueStack stack) { super(stack); diff --git a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java index b2affa8f9..f2b304e72 100644 --- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java +++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java @@ -23,8 +23,6 @@ package org.apache.struts2.components; import java.io.IOException; import java.io.Writer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.util.UrlHelper; @@ -32,6 +30,8 @@ import org.apache.struts2.views.util.UrlHelper; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Implementation of the {@link UrlRenderer} interface that creates URLs suitable in a servlet environment. @@ -41,7 +41,7 @@ public class ServletUrlRenderer implements UrlRenderer { /** * Provide a logging instance. */ - private static final Log LOG = LogFactory.getLog(ServletUrlRenderer.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletUrlRenderer.class); /** diff --git a/core/src/main/java/org/apache/struts2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java index 22b8663c0..6710c712f 100644 --- a/core/src/main/java/org/apache/struts2/components/Submit.java +++ b/core/src/main/java/org/apache/struts2/components/Submit.java @@ -25,12 +25,12 @@ import java.io.Writer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -52,7 +52,7 @@ import com.opensymphony.xwork2.util.ValueStack; allowDynamicAttributes=true) public class Submit extends FormButton { - private static final Log LOG = LogFactory.getLog(Submit.class); + private static final Logger LOG = LoggerFactory.getLogger(Submit.class); final public static String TEMPLATE = "submit"; protected String src; diff --git a/core/src/main/java/org/apache/struts2/components/Text.java b/core/src/main/java/org/apache/struts2/components/Text.java index 668ed64bc..87b08817c 100644 --- a/core/src/main/java/org/apache/struts2/components/Text.java +++ b/core/src/main/java/org/apache/struts2/components/Text.java @@ -27,14 +27,14 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; +import com.opensymphony.xwork2.TextProvider; import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.TextProvider; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -119,7 +119,7 @@ import com.opensymphony.xwork2.TextProvider; description="Render a I18n text message", allowDynamicAttributes=true) public class Text extends ContextBean implements Param.UnnamedParametric { - private static final Log LOG = LogFactory.getLog(Text.class); + private static final Logger LOG = LoggerFactory.getLogger(Text.class); protected List values = Collections.EMPTY_LIST; protected String actualName; diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index 00dce65a6..f989637bf 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -30,19 +30,19 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsConstants; import org.apache.struts2.components.template.Template; import org.apache.struts2.components.template.TemplateEngine; import org.apache.struts2.components.template.TemplateEngineManager; import org.apache.struts2.components.template.TemplateRenderingContext; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.util.ContextUtil; import com.opensymphony.xwork2.config.ConfigurationException; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * UIBean is the standard superclass of all Struts UI componentns. @@ -401,7 +401,7 @@ import com.opensymphony.xwork2.util.ValueStack; * */ public abstract class UIBean extends Component { - private static final Log LOG = LogFactory.getLog(UIBean.class); + private static final Logger LOG = LoggerFactory.getLogger(UIBean.class); protected HttpServletRequest request; protected HttpServletResponse response; diff --git a/core/src/main/java/org/apache/struts2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java index 953102f33..88076df36 100644 --- a/core/src/main/java/org/apache/struts2/components/URL.java +++ b/core/src/main/java/org/apache/struts2/components/URL.java @@ -20,9 +20,6 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; - import java.io.Writer; import java.util.Collections; import java.util.Iterator; @@ -32,13 +29,16 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.util.UrlHelper; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * * @@ -116,7 +116,7 @@ import org.apache.struts2.views.util.UrlHelper; */ @StrutsTag(name="url", tldTagClass="org.apache.struts2.views.jsp.URLTag", description="This tag is used to create a URL") public class URL extends ContextBean { - private static final Log LOG = LogFactory.getLog(URL.class); + private static final Logger LOG = LoggerFactory.getLogger(URL.class); /** * The includeParams attribute may have the value 'none', 'get' or 'all'. diff --git a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java index fc0e8337f..4d6ebc65e 100644 --- a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java +++ b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java @@ -26,12 +26,12 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -81,7 +81,7 @@ import com.opensymphony.xwork2.util.ValueStack; description="Create a Select component with buttons to move the elements in the select component up and down") public class UpDownSelect extends Select { - private static final Log _log = LogFactory.getLog(UpDownSelect.class); + private static final Logger LOG = LoggerFactory.getLogger(UpDownSelect.class); final public static String TEMPLATE = "updownselect"; @@ -155,7 +155,7 @@ public class UpDownSelect extends Select { ancestorForm.getParameters().put("updownselectIds", m); } else { - _log.warn("no ancestor form found for updownselect "+this+", therefore autoselect of all elements upon form submission will not work "); + LOG.warn("no ancestor form found for updownselect "+this+", therefore autoselect of all elements upon form submission will not work "); } } diff --git a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java index de4fd1b9b..344273607 100644 --- a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java @@ -29,17 +29,16 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.util.ClassLoaderUtil; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Base class for template engines. */ public abstract class BaseTemplateEngine implements TemplateEngine { - private static final Log LOG = LogFactory.getLog(BaseTemplateEngine.class); + private static final Logger LOG = LoggerFactory.getLogger(BaseTemplateEngine.class); /** The default theme properties file name. Default is 'theme.properties' */ public static final String DEFAULT_THEME_PROPERTIES_FILE_NAME = "theme.properties"; diff --git a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java index 46c01792b..b516333e4 100644 --- a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java @@ -20,22 +20,6 @@ */ package org.apache.struts2.components.template; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.ValueStack; -import freemarker.template.Configuration; -import freemarker.template.SimpleHash; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.ServletActionContext; -import org.apache.struts2.StrutsConstants; -import org.apache.struts2.views.freemarker.FreemarkerManager; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Writer; import java.util.HashMap; @@ -43,6 +27,25 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.views.freemarker.FreemarkerManager; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.ClassLoaderUtil; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + +import freemarker.template.Configuration; +import freemarker.template.SimpleHash; + /** * Freemarker based template engine. */ @@ -66,7 +69,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine { } } - private static final Log LOG = LogFactory.getLog(FreemarkerTemplateEngine.class); + private static final Logger LOG = LoggerFactory.getLogger(FreemarkerTemplateEngine.class); @Inject public void setFreemarkerManager(FreemarkerManager mgr) { diff --git a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java index ff0e5565c..6231f2530 100644 --- a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java @@ -20,22 +20,24 @@ */ package org.apache.struts2.components.template; -import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.util.List; + +import javax.servlet.http.HttpServletResponse; +import javax.servlet.jsp.PageContext; + import org.apache.struts2.ServletActionContext; import org.apache.struts2.components.Include; import org.apache.struts2.components.UIBean; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; -import java.util.List; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * JSP based template engine. */ public class JspTemplateEngine extends BaseTemplateEngine { - private static final Log LOG = LogFactory.getLog(JspTemplateEngine.class); + private static final Logger LOG = LoggerFactory.getLogger(JspTemplateEngine.class); public void renderTemplate(TemplateRenderingContext templateContext) throws Exception { Template template = templateContext.getTemplate(); diff --git a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java index 3d6d47755..a2f92efbd 100644 --- a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java @@ -20,27 +20,29 @@ */ package org.apache.struts2.components.template; -import com.opensymphony.xwork2.inject.Inject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.ServletActionContext; -import org.apache.struts2.views.velocity.VelocityManager; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.context.Context; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Writer; import java.util.List; import java.util.Map; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.views.velocity.VelocityManager; +import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.context.Context; + +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * Velocity based template engine. */ public class VelocityTemplateEngine extends BaseTemplateEngine { - private static final Log LOG = LogFactory.getLog(VelocityTemplateEngine.class); + private static final Logger LOG = LoggerFactory.getLogger(VelocityTemplateEngine.class); private VelocityManager velocityManager; diff --git a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java index 80257b2e3..f94ef4642 100644 --- a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java @@ -23,8 +23,6 @@ package org.apache.struts2.config; import java.util.Properties; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import org.apache.struts2.components.UrlRenderer; import org.apache.struts2.dispatcher.mapper.ActionMapper; @@ -49,6 +47,8 @@ import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.util.LocalizedTextUtil; import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.util.location.LocatableProperties; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import com.opensymphony.xwork2.validator.ActionValidatorManager; @@ -166,7 +166,7 @@ import com.opensymphony.xwork2.validator.ActionValidatorManager; */ public class BeanSelectionProvider implements ConfigurationProvider { public static final String DEFAULT_BEAN_NAME = "struts"; - private static final Log LOG = LogFactory.getLog(BeanSelectionProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(BeanSelectionProvider.class); public void destroy() { // NO-OP diff --git a/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java index 7488504a5..f730c7af1 100644 --- a/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java @@ -27,9 +27,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationException; @@ -45,6 +42,8 @@ import com.opensymphony.xwork2.util.ResolverUtil; import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ResolverUtil.ClassTest; import com.opensymphony.xwork2.util.location.LocatableProperties; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * ClasspathConfigurationProvider loads the configuration @@ -135,7 +134,7 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider { /** * Logging instance for this class. */ - private static final Log LOG = LogFactory.getLog(ClasspathConfigurationProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(ClasspathConfigurationProvider.class); /** * The XWork Configuration for this application. diff --git a/core/src/main/java/org/apache/struts2/config/DefaultSettings.java b/core/src/main/java/org/apache/struts2/config/DefaultSettings.java index a0e847868..2c06edf09 100644 --- a/core/src/main/java/org/apache/struts2/config/DefaultSettings.java +++ b/core/src/main/java/org/apache/struts2/config/DefaultSettings.java @@ -24,10 +24,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** @@ -41,7 +42,7 @@ public class DefaultSettings extends Settings { /** * The logging instance for this class. */ - protected Log log = LogFactory.getLog(this.getClass()); + protected Logger log = LoggerFactory.getLogger(this.getClass()); /** * The Settings object that handles API calls. diff --git a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java index fbd84f113..42c76961b 100644 --- a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java +++ b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java @@ -25,14 +25,14 @@ import java.io.InputStream; import java.net.URL; import java.util.Iterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsException; import org.apache.struts2.util.ClassLoaderUtils; import com.opensymphony.xwork2.util.location.LocatableProperties; import com.opensymphony.xwork2.util.location.Location; import com.opensymphony.xwork2.util.location.LocationImpl; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -41,7 +41,7 @@ import com.opensymphony.xwork2.util.location.LocationImpl; class PropertiesSettings extends Settings { LocatableProperties settings; - static Log LOG = LogFactory.getLog(PropertiesSettings.class); + static Logger LOG = LoggerFactory.getLogger(PropertiesSettings.class); /** diff --git a/core/src/main/java/org/apache/struts2/config/Settings.java b/core/src/main/java/org/apache/struts2/config/Settings.java index a8e65ce0d..c623d627e 100644 --- a/core/src/main/java/org/apache/struts2/config/Settings.java +++ b/core/src/main/java/org/apache/struts2/config/Settings.java @@ -24,12 +24,12 @@ import java.util.Iterator; import java.util.Locale; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.util.location.Location; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -82,7 +82,7 @@ class Settings { /** * The Logging instance for this class. */ - private static final Log LOG = LogFactory.getLog(Settings.class); + private static final Logger LOG = LoggerFactory.getLogger(Settings.class); /** * Registers a custom Settings implementation (plugin), diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index 5c4579e9c..ebf4823c5 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -32,9 +32,6 @@ import java.util.Map; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.config.ConfigurationException; import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; @@ -42,13 +39,15 @@ import com.opensymphony.xwork2.inject.ContainerBuilder; import com.opensymphony.xwork2.inject.Context; import com.opensymphony.xwork2.inject.Factory; import com.opensymphony.xwork2.util.location.LocatableProperties; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Override Xwork class so we can use an arbitrary config file */ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { - private static final Log LOG = LogFactory.getLog(StrutsXmlConfigurationProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(StrutsXmlConfigurationProvider.class); private File baseDir = null; private String filename; private String reloadKey; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java index a5871b859..094076298 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java @@ -31,10 +31,9 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.profiling.UtilTimerStack; /** @@ -67,7 +66,7 @@ import com.opensymphony.xwork2.util.profiling.UtilTimerStack; */ public class ActionContextCleanUp implements Filter { - private static final Log LOG = LogFactory.getLog(ActionContextCleanUp.class); + private static final Logger LOG = LoggerFactory.getLogger(ActionContextCleanUp.class); private static final String COUNTER = "__cleanup_recursion_counter"; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index 712d9cb94..ac7cb4c43 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -35,8 +35,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsStatics; @@ -75,6 +73,8 @@ import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.util.location.LocatableProperties; import com.opensymphony.xwork2.util.location.Location; import com.opensymphony.xwork2.util.location.LocationUtils; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.profiling.UtilTimerStack; import freemarker.template.Template; @@ -92,7 +92,7 @@ public class Dispatcher { /** * Provide a logging instance. */ - private static final Log LOG = LogFactory.getLog(Dispatcher.class); + private static final Logger LOG = LoggerFactory.getLogger(Dispatcher.class); /** * Provide a thread local instance. diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java index e5781d78f..cbe00abda 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java @@ -42,20 +42,24 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.RequestUtils; import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; +import org.apache.struts2.util.ClassLoaderUtils; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.ConfigurationProvider; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.profiling.UtilTimerStack; -import com.opensymphony.xwork2.ActionContext; /** * Master filter for Struts that handles four distinct @@ -126,6 +130,8 @@ import com.opensymphony.xwork2.ActionContext; * *

  • configProviders - a comma-delimited list of Java classes that implement the * {@link ConfigurationProvider} interface that should be used for building the {@link Configuration}.
    • + * + *
  • loggerFactory - The class name of the {@link LoggerFactory} implementation.
    • * *
  • * - any other parameters are treated as framework constants.
    • * @@ -148,7 +154,7 @@ public class FilterDispatcher implements StrutsStatics, Filter { /** * Provide a logging instance. */ - private static final Log LOG = LogFactory.getLog(FilterDispatcher.class); + private Logger log; /** * Store set of path prefixes to use with static resources. @@ -197,8 +203,10 @@ public class FilterDispatcher implements StrutsStatics, Filter { * @param filterConfig The filter configuration */ public void init(FilterConfig filterConfig) throws ServletException { - this.filterConfig = filterConfig; - + this.filterConfig = filterConfig; + + initLogging(); + dispatcher = createDispatcher(filterConfig); dispatcher.init(); dispatcher.getContainer().inject(this); @@ -211,6 +219,29 @@ public class FilterDispatcher implements StrutsStatics, Filter { this.pathPrefixes = parse(packages); } + private void initLogging() { + String factoryName = filterConfig.getInitParameter("loggerFactory"); + if (factoryName != null) { + try { + Class cls = ClassLoaderUtils.loadClass(factoryName, this.getClass()); + LoggerFactory fac = (LoggerFactory)cls.newInstance(); + LoggerFactory.setLoggerFactory(fac); + } catch (InstantiationException e) { + System.err.println("Unable to instantiate logger factory: "+factoryName+", using default"); + e.printStackTrace(); + } catch (IllegalAccessException e) { + System.err.println("Unable to access logger factory: "+factoryName+", using default"); + e.printStackTrace(); + } catch (ClassNotFoundException e) { + System.err.println("Unable to locate logger factory class: "+factoryName+", using default"); + e.printStackTrace(); + } + } + + log = LoggerFactory.getLogger(FilterDispatcher.class); + + } + /** * Calls dispatcher.cleanup, * which in turn releases local threads and destroys any DispatchListeners. @@ -219,7 +250,7 @@ public class FilterDispatcher implements StrutsStatics, Filter { */ public void destroy() { if (dispatcher == null) { - LOG.warn("something is seriously wrong, Dispatcher is not initialized (null) "); + log.warn("something is seriously wrong, Dispatcher is not initialized (null) "); } else { dispatcher.cleanup(); } @@ -333,7 +364,7 @@ public class FilterDispatcher implements StrutsStatics, Filter { request = dispatcher.wrapRequest(request, getServletContext()); } catch (IOException e) { String message = "Could not wrap servlet request with MultipartRequestWrapper!"; - LOG.error(message, e); + log.error(message, e); throw new ServletException(message, e); } @@ -400,7 +431,7 @@ public class FilterDispatcher implements StrutsStatics, Filter { try { mapping = actionMapper.getMapping(request, dispatcher.getConfigurationManager()); } catch (Exception ex) { - LOG.error("error getting ActionMapping", ex); + log.error("error getting ActionMapping", ex); dispatcher.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex); return; } @@ -456,7 +487,7 @@ public class FilterDispatcher implements StrutsStatics, Filter { try { ifModifiedSince = request.getDateHeader("If-Modified-Since"); } catch (Exception e) { - LOG.warn("Invalid If-Modified-Since header value: '" + request.getHeader("If-Modified-Since") + "', ignoring"); + log.warn("Invalid If-Modified-Since header value: '" + request.getHeader("If-Modified-Since") + "', ignoring"); } long lastModifiedMillis = lastModifiedCal.getTimeInMillis(); long now = cal.getTimeInMillis(); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java index 249cb2e8d..667ee997e 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java @@ -26,10 +26,11 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpSession; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.config.ServletContextSingleton; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * When running Weblogic Server 6.1, this class should be @@ -48,8 +49,7 @@ import org.apache.struts2.config.ServletContextSingleton; */ public class FilterDispatcherCompatWeblogic61 extends FilterDispatcher { - private static Log log = - LogFactory.getLog(FilterDispatcherCompatWeblogic61.class); + private static Logger LOG = LoggerFactory.getLogger(FilterDispatcherCompatWeblogic61.class); /** * dummy setter for {@link #filterConfig}; this method @@ -67,7 +67,7 @@ public class FilterDispatcherCompatWeblogic61 extends FilterDispatcher { try { init(filterConfig); } catch (ServletException se) { - log.error("Couldn't set the filter configuration in this filter", se); + LOG.error("Couldn't set the filter configuration in this filter", se); } ServletContextSingleton singleton = ServletContextSingleton.getInstance(); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java index d789ef306..f3d21858c 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java @@ -27,10 +27,9 @@ import java.nio.charset.Charset; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -76,7 +75,7 @@ public class PlainTextResult extends StrutsResultSupport { public static final int BUFFER_SIZE = 1024; - private static final Log _log = LogFactory.getLog(PlainTextResult.class); + private static final Logger LOG = LoggerFactory.getLogger(PlainTextResult.class); private static final long serialVersionUID = 3633371605905583950L; @@ -120,7 +119,7 @@ public class PlainTextResult extends StrutsResultSupport { charset = Charset.forName(charSet); } else { - _log.warn("charset ["+charSet+"] is not recognized "); + LOG.warn("charset ["+charSet+"] is not recognized "); charset = null; } } @@ -148,7 +147,7 @@ public class PlainTextResult extends StrutsResultSupport { reader = new InputStreamReader(servletContext.getResourceAsStream(finalLocation)); } if (reader == null) { - _log.warn("resource at location ["+finalLocation+"] cannot be obtained (return null) from ServletContext !!! "); + LOG.warn("resource at location ["+finalLocation+"] cannot be obtained (return null) from ServletContext !!! "); } else { char[] buffer = new char[BUFFER_SIZE]; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java index 8e651807e..9cc736940 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java @@ -26,14 +26,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.util.UrlHelper; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.reflection.ReflectionException; import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler; @@ -120,7 +120,7 @@ public class ServletActionRedirectResult extends ServletRedirectResult implement /** The default parameter */ public static final String DEFAULT_PARAM = "actionName"; - private static final Log LOG = LogFactory.getLog(ServletActionRedirectResult.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletActionRedirectResult.class); protected String actionName; protected String namespace; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java index ad43609da..5bac8ab9b 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java @@ -25,11 +25,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.PageContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -89,7 +89,7 @@ public class ServletDispatcherResult extends StrutsResultSupport { private static final long serialVersionUID = -1970659272360685627L; - private static final Log log = LogFactory.getLog(ServletDispatcherResult.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletDispatcherResult.class); public ServletDispatcherResult() { super(); @@ -109,8 +109,8 @@ public class ServletDispatcherResult extends StrutsResultSupport { * HTTP request. */ public void doExecute(String finalLocation, ActionInvocation invocation) throws Exception { - if (log.isDebugEnabled()) { - log.debug("Forwarding to location " + finalLocation); + if (LOG.isDebugEnabled()) { + LOG.debug("Forwarding to location " + finalLocation); } PageContext pageContext = ServletActionContext.getPageContext(); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java index e89affa6b..635514747 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java @@ -23,8 +23,6 @@ package org.apache.struts2.dispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; @@ -32,6 +30,8 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -81,7 +81,7 @@ public class ServletRedirectResult extends StrutsResultSupport { private static final long serialVersionUID = 6316947346435301270L; - private static final Log log = LogFactory.getLog(ServletRedirectResult.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletRedirectResult.class); protected boolean prependServletContext = true; @@ -146,8 +146,8 @@ public class ServletRedirectResult extends StrutsResultSupport { finalLocation = response.encodeRedirectURL(finalLocation); } - if (log.isDebugEnabled()) { - log.debug("Redirecting to finalLocation " + finalLocation); + if (LOG.isDebugEnabled()) { + LOG.debug("Redirecting to finalLocation " + finalLocation); } response.sendRedirect(finalLocation); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java index e77100f51..581c470b8 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java @@ -25,10 +25,9 @@ import java.io.OutputStream; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -80,7 +79,7 @@ public class StreamResult extends StrutsResultSupport { private static final long serialVersionUID = -1468409635999059850L; - protected static final Log log = LogFactory.getLog(StreamResult.class); + protected static final Logger LOG = LoggerFactory.getLogger(StreamResult.class); public static final String DEFAULT_PARAM = "inputName"; @@ -185,7 +184,7 @@ public class StreamResult extends StrutsResultSupport { if (inputStream == null) { String msg = ("Can not find a java.io.InputStream with the name [" + inputName + "] in the invocation stack. " + "Check the tag specified for this action."); - log.error(msg); + LOG.error(msg); throw new IllegalArgumentException(msg); } @@ -206,7 +205,7 @@ public class StreamResult extends StrutsResultSupport { } } catch(NumberFormatException e) { - log.warn("failed to recongnize "+_contentLength+" as a number, contentLength header will not be set", e); + LOG.warn("failed to recongnize "+_contentLength+" as a number, contentLength header will not be set", e); } } @@ -218,19 +217,19 @@ public class StreamResult extends StrutsResultSupport { // Get the outputstream oOutput = oResponse.getOutputStream(); - if (log.isDebugEnabled()) { - log.debug("Streaming result [" + inputName + "] type=[" + contentType + "] length=[" + contentLength + + if (LOG.isDebugEnabled()) { + LOG.debug("Streaming result [" + inputName + "] type=[" + contentType + "] length=[" + contentLength + "] content-disposition=[" + contentDisposition + "]"); } // Copy input to output - log.debug("Streaming to output buffer +++ START +++"); + LOG.debug("Streaming to output buffer +++ START +++"); byte[] oBuff = new byte[bufferSize]; int iSize; while (-1 != (iSize = inputStream.read(oBuff))) { oOutput.write(oBuff, 0, iSize); } - log.debug("Streaming to output buffer +++ END +++"); + LOG.debug("Streaming to output buffer +++ END +++"); // Flush oOutput.flush(); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java index 6d9140763..24d9f8ebf 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java @@ -23,13 +23,13 @@ package org.apache.struts2.dispatcher; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsStatics; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.util.TextParseUtil; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -102,7 +102,7 @@ import com.opensymphony.xwork2.util.TextParseUtil; */ public abstract class StrutsResultSupport implements Result, StrutsStatics { - private static final Log _log = LogFactory.getLog(StrutsResultSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(StrutsResultSupport.class); /** The default parameter */ public static final String DEFAULT_PARAM = "location"; @@ -205,7 +205,7 @@ public abstract class StrutsResultSupport implements Result, StrutsStatics { return URLEncoder.encode(parsedValue.toString(), "UTF-8"); } catch(UnsupportedEncodingException e) { - _log.warn("error while trying to encode ["+parsedValue+"]", e); + LOG.warn("error while trying to encode ["+parsedValue+"]", e); } } } diff --git a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java index e29a05761..6b9e2fd7d 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java @@ -30,8 +30,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspFactory; import javax.servlet.jsp.PageContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.JspSupportServlet; @@ -44,6 +42,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -86,7 +86,7 @@ public class VelocityResult extends StrutsResultSupport { private static final long serialVersionUID = 7268830767762559424L; - private static final Log log = LogFactory.getLog(VelocityResult.class); + private static final Logger LOG = LoggerFactory.getLogger(VelocityResult.class); private String defaultEncoding; private VelocityManager velocityManager; @@ -161,7 +161,7 @@ public class VelocityResult extends StrutsResultSupport { // to do it all the time (WW-829). Since Velocity support is being deprecated, we'll oblige :) writer.flush(); } catch (Exception e) { - log.error("Unable to render Velocity Template, '" + finalLocation + "'", e); + LOG.error("Unable to render Velocity Template, '" + finalLocation + "'", e); throw e; } finally { if (usedJspFactory) { diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java index ec7339566..dece2f7e2 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java @@ -25,13 +25,13 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -84,7 +84,7 @@ import com.opensymphony.xwork2.inject.Inject; */ public class CompositeActionMapper implements ActionMapper { - private static final Log LOG = LogFactory.getLog(CompositeActionMapper.class); + private static final Logger LOG = LoggerFactory.getLogger(CompositeActionMapper.class); protected Container container; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java index ceb0cca1a..99f394f7a 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java @@ -20,18 +20,19 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.inject.Inject; - -import javax.servlet.http.HttpServletRequest; +import java.net.URLDecoder; import java.util.HashMap; import java.util.StringTokenizer; -import java.net.URLDecoder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import javax.servlet.http.HttpServletRequest; + import org.apache.struts2.StrutsConstants; +import com.opensymphony.xwork2.config.ConfigurationManager; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * * @@ -93,7 +94,7 @@ import org.apache.struts2.StrutsConstants; */ public class Restful2ActionMapper extends DefaultActionMapper { - protected static final Log LOG = LogFactory.getLog(Restful2ActionMapper.class); + protected static final Logger LOG = LoggerFactory.getLogger(Restful2ActionMapper.class); public static final String HTTP_METHOD_PARAM = "__http_method"; private String idParameterName = null; @@ -203,7 +204,7 @@ public class Restful2ActionMapper extends DefaultActionMapper { mapping.getParams().putAll(parameters); } } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to determine parameters from the url", e); } mapping.setName(actionName.substring(actionSlashPos+1)); } diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java index 898c0d4b2..f0f5c3fb7 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java @@ -28,11 +28,11 @@ import java.util.StringTokenizer; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.RequestUtils; import com.opensymphony.xwork2.config.ConfigurationManager; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -63,7 +63,7 @@ import com.opensymphony.xwork2.config.ConfigurationManager; * */ public class RestfulActionMapper implements ActionMapper { - protected static final Log LOG = LogFactory.getLog(RestfulActionMapper.class); + protected static final Logger LOG = LoggerFactory.getLogger(RestfulActionMapper.class); /* (non-Javadoc) * @see org.apache.struts2.dispatcher.mapper.ActionMapper#getMapping(javax.servlet.http.HttpServletRequest) @@ -105,7 +105,7 @@ public class RestfulActionMapper implements ActionMapper { } } } catch (Exception e) { - LOG.warn(e); + LOG.warn("Cannot determine url parameters", e); } return new ActionMapping(actionName, "", "", parameters); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java index 880c0725c..54e82e3b7 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java @@ -38,11 +38,11 @@ import org.apache.commons.fileupload.RequestContext; import org.apache.commons.fileupload.disk.DiskFileItem; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Multipart form data request adapter for Jakarta Commons Fileupload package. @@ -50,7 +50,7 @@ import com.opensymphony.xwork2.inject.Inject; */ public class JakartaMultiPartRequest implements MultiPartRequest { - static final Log log = LogFactory.getLog(MultiPartRequest.class); + static final Logger LOG = LoggerFactory.getLogger(MultiPartRequest.class); // maps parameter name -> List of FileItem objects private Map> files = new HashMap>(); @@ -91,9 +91,9 @@ public class JakartaMultiPartRequest implements MultiPartRequest { for (Object item1 : items) { FileItem item = (FileItem) item1; - if (log.isDebugEnabled()) log.debug("Found item " + item.getFieldName()); + if (LOG.isDebugEnabled()) LOG.debug("Found item " + item.getFieldName()); if (item.isFormField()) { - log.debug("Item is a normal form field"); + LOG.debug("Item is a normal form field"); List values; if (params.get(item.getFieldName()) != null) { values = params.get(item.getFieldName()); @@ -113,11 +113,11 @@ public class JakartaMultiPartRequest implements MultiPartRequest { } params.put(item.getFieldName(), values); } else { - log.debug("Item is a file upload"); + LOG.debug("Item is a file upload"); // Skip file uploads that don't have a file name - meaning that no file was selected. if (item.getName() == null || item.getName().trim().length() < 1) { - log.debug("No file has been uploaded for the field: " + item.getFieldName()); + LOG.debug("No file has been uploaded for the field: " + item.getFieldName()); continue; } @@ -133,7 +133,7 @@ public class JakartaMultiPartRequest implements MultiPartRequest { } } } catch (FileUploadException e) { - log.error(e); + LOG.error("Unable to parse request", e); errors.add(e.getMessage()); } } diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java index a920fe893..e2745229b 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java @@ -31,10 +31,11 @@ import java.util.Vector; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.dispatcher.StrutsRequestWrapper; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * Parse a multipart request and provide a wrapper around the request. The parsing implementation used @@ -53,7 +54,7 @@ import org.apache.struts2.dispatcher.StrutsRequestWrapper; * */ public class MultiPartRequestWrapper extends StrutsRequestWrapper { - protected static final Log log = LogFactory.getLog(MultiPartRequestWrapper.class); + protected static final Logger LOG = LoggerFactory.getLogger(MultiPartRequestWrapper.class); Collection errors; MultiPartRequest multi; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java index a693ce7e9..7941414ba 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java @@ -28,15 +28,15 @@ import java.util.Set; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.apache.struts2.ServletActionContext; + import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.TextParseUtil; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -161,7 +161,7 @@ public class CookieInterceptor extends AbstractInterceptor { private static final long serialVersionUID = 4153142432948747305L; - private static final Log LOG = LogFactory.getLog(CookieInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(CookieInterceptor.class); private Set cookiesNameSet = Collections.EMPTY_SET; private Set cookiesValueSet = Collections.EMPTY_SET; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java index 32d9daeca..cc644fec1 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java @@ -20,12 +20,12 @@ */ package org.apache.struts2.interceptor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -80,14 +80,14 @@ public class CreateSessionInterceptor extends AbstractInterceptor { private static final long serialVersionUID = -4590322556118858869L; - private static final Log _log = LogFactory.getLog(CreateSessionInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(CreateSessionInterceptor.class); /* (non-Javadoc) * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation) */ public String intercept(ActionInvocation invocation) throws Exception { - _log.debug("Creating HttpSession"); + LOG.debug("Creating HttpSession"); ServletActionContext.getRequest().getSession(true); return invocation.invoke(); } diff --git a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java index 6e300dd0a..96e06784d 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java @@ -23,14 +23,13 @@ package org.apache.struts2.interceptor; import java.util.Collections; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.config.entities.ResultConfig; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -165,7 +164,7 @@ public class ExecuteAndWaitInterceptor extends MethodFilterInterceptor { private static final long serialVersionUID = -2754639196749652512L; - private static final Log LOG = LogFactory.getLog(ExecuteAndWaitInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(ExecuteAndWaitInterceptor.class); public static final String KEY = "__execWait"; public static final String WAIT = "wait"; diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java index 89ed10dfc..03d13d1fa 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java @@ -33,8 +33,6 @@ import java.util.StringTokenizer; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; @@ -44,6 +42,8 @@ import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ValidationAware; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import com.opensymphony.xwork2.util.LocalizedTextUtil; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -162,7 +162,7 @@ public class FileUploadInterceptor extends AbstractInterceptor { private static final long serialVersionUID = -4764627478894962478L; - protected static final Log log = LogFactory.getLog(FileUploadInterceptor.class); + protected static final Logger LOG = LoggerFactory.getLogger(FileUploadInterceptor.class); private static final String DEFAULT_DELIMITER = ","; private static final String DEFAULT_MESSAGE = "no.message.found"; @@ -199,9 +199,9 @@ public class FileUploadInterceptor extends AbstractInterceptor { HttpServletRequest request = (HttpServletRequest) ac.get(ServletActionContext.HTTP_REQUEST); if (!(request instanceof MultiPartRequestWrapper)) { - if (log.isDebugEnabled()) { + if (LOG.isDebugEnabled()) { ActionProxy proxy = invocation.getProxy(); - log.debug(getTextMessage("struts.messages.bypass.request", new Object[]{proxy.getNamespace(), proxy.getActionName()}, ActionContext.getContext().getLocale())); + LOG.debug(getTextMessage("struts.messages.bypass.request", new Object[]{proxy.getNamespace(), proxy.getActionName()}, ActionContext.getContext().getLocale())); } return invocation.invoke(); @@ -224,7 +224,7 @@ public class FileUploadInterceptor extends AbstractInterceptor { validation.addActionError(error); } - log.error(error); + LOG.error(error); } } @@ -257,10 +257,10 @@ public class FileUploadInterceptor extends AbstractInterceptor { } } } else { - log.error(getTextMessage("struts.messages.invalid.file", new Object[]{inputName}, ActionContext.getContext().getLocale())); + LOG.error(getTextMessage("struts.messages.invalid.file", new Object[]{inputName}, ActionContext.getContext().getLocale())); } } else { - log.error(getTextMessage("struts.messages.invalid.content.type", new Object[]{inputName}, ActionContext.getContext().getLocale())); + LOG.error(getTextMessage("struts.messages.invalid.content.type", new Object[]{inputName}, ActionContext.getContext().getLocale())); } } @@ -274,7 +274,7 @@ public class FileUploadInterceptor extends AbstractInterceptor { File[] file = multiWrapper.getFiles(inputValue); for (int index = 0; index < file.length; index++) { File currentFile = file[index]; - log.info(getTextMessage("struts.messages.removing.file", new Object[]{inputValue, currentFile}, ActionContext.getContext().getLocale())); + LOG.info(getTextMessage("struts.messages.removing.file", new Object[]{inputValue, currentFile}, ActionContext.getContext().getLocale())); if ((currentFile != null) && currentFile.isFile()) { currentFile.delete(); @@ -306,21 +306,21 @@ public class FileUploadInterceptor extends AbstractInterceptor { validation.addFieldError(inputName, errMsg); } - log.error(errMsg); + LOG.error(errMsg); } else if (maximumSize != null && maximumSize.longValue() < file.length()) { String errMsg = getTextMessage("struts.messages.error.file.too.large", new Object[]{inputName, file.getName(), "" + file.length()}, locale); if (validation != null) { validation.addFieldError(inputName, errMsg); } - log.error(errMsg); + LOG.error(errMsg); } else if ((! allowedTypesSet.isEmpty()) && (!containsItem(allowedTypesSet, contentType))) { String errMsg = getTextMessage("struts.messages.error.content.type.not.allowed", new Object[]{inputName, file.getName(), contentType}, locale); if (validation != null) { validation.addFieldError(inputName, errMsg); } - log.error(errMsg); + LOG.error(errMsg); } else { fileIsAcceptable = true; } diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java index d96645c85..0ebceaa71 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java @@ -25,13 +25,12 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ValidationAware; import com.opensymphony.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -140,7 +139,7 @@ public class MessageStoreInterceptor implements Interceptor { private static final long serialVersionUID = 4491997514314242420L; - private static final Log _log = LogFactory.getLog(MessageStoreInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(MessageStoreInterceptor.class); public static final String STORE_MODE = "STORE"; @@ -189,13 +188,13 @@ public class MessageStoreInterceptor implements Interceptor { } public String intercept(ActionInvocation invocation) throws Exception { - _log.debug("entering MessageStoreInterceptor ..."); + LOG.debug("entering MessageStoreInterceptor ..."); before(invocation); String result = invocation.invoke(); after(invocation, result); - _log.debug("exit executing MessageStoreInterceptor"); + LOG.debug("exit executing MessageStoreInterceptor"); return result; } @@ -218,7 +217,7 @@ public class MessageStoreInterceptor implements Interceptor { Map session = (Map) invocation.getInvocationContext().get(ActionContext.SESSION); ValidationAware validationAwareAction = (ValidationAware) action; - _log.debug("retrieve error / message from session to populate into action ["+action+"]"); + LOG.debug("retrieve error / message from session to populate into action ["+action+"]"); Collection actionErrors = (Collection) session.get(actionErrorsSessionKey); Collection actionMessages = (Collection) session.get(actionMessagesSessionKey); @@ -264,7 +263,7 @@ public class MessageStoreInterceptor implements Interceptor { // store error / messages into session Map session = (Map) invocation.getInvocationContext().get(ActionContext.SESSION); - _log.debug("store action ["+action+"] error/messages into session "); + LOG.debug("store action ["+action+"] error/messages into session "); ValidationAware validationAwareAction = (ValidationAware) action; session.put(actionErrorsSessionKey, validationAwareAction.getActionErrors()); @@ -272,7 +271,7 @@ public class MessageStoreInterceptor implements Interceptor { session.put(fieldErrorsSessionKey, validationAwareAction.getFieldErrors()); } else { - _log.debug("Action ["+action+"] is not ValidationAware, no message / error that are storeable"); + LOG.debug("Action ["+action+"] is not ValidationAware, no message / error that are storeable"); } } } diff --git a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java index c5f56fb65..1fe33b5b0 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java @@ -20,13 +20,10 @@ */ package org.apache.struts2.interceptor; +import java.io.Serializable; import java.util.IdentityHashMap; import java.util.Map; -import java.io.Serializable; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.SessionMap; @@ -37,6 +34,8 @@ import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import com.opensymphony.xwork2.interceptor.PreResultListener; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -142,7 +141,7 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi private static final long serialVersionUID = 9120762699600054395L; - private static final Log LOG = LogFactory.getLog(ScopeInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(ScopeInterceptor.class); private String[] application = null; private String[] session = null; diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java index 36a74b592..fd507ba81 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java @@ -37,8 +37,6 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.freemarker.FreemarkerManager; @@ -50,6 +48,8 @@ import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.Interceptor; import com.opensymphony.xwork2.interceptor.PreResultListener; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; /** @@ -91,7 +91,7 @@ public class DebuggingInterceptor implements Interceptor { private static final long serialVersionUID = -3097324155953078783L; - private final static Log log = LogFactory.getLog(DebuggingInterceptor.class); + private final static Logger LOG = LoggerFactory.getLogger(DebuggingInterceptor.class); private String[] ignorePrefixes = new String[]{"org.apache.struts.", "com.opensymphony.xwork2.", "xwork."}; @@ -191,7 +191,7 @@ public class DebuggingInterceptor implements Interceptor { try { result.execute(inv); } catch (Exception ex) { - log.error("Unable to create debugging console", ex); + LOG.error("Unable to create debugging console", ex); } } @@ -250,7 +250,7 @@ public class DebuggingInterceptor implements Interceptor { result.setLocation("/org/apache/struts2/interceptor/debugging/browser.ftl"); result.execute(inv); } catch (Exception ex) { - log.error("Unable to create debugging console", ex); + LOG.error("Unable to create debugging console", ex); } } @@ -365,8 +365,8 @@ public class DebuggingInterceptor implements Interceptor { writer.flush(); // Check stack for this object if ((bean != null) && (stack.contains(bean))) { - if (log.isInfoEnabled()) { - log.info("Circular reference detected, not serializing object: " + if (LOG.isInfoEnabled()) { + LOG.info("Circular reference detected, not serializing object: " + name); } return; @@ -426,7 +426,7 @@ public class DebuggingInterceptor implements Interceptor { } } } catch (Exception e) { - log.error(e, e); + LOG.error(e.toString(), e); } } } diff --git a/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java index c723cc64a..f7c9523c8 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java @@ -29,14 +29,14 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ValidationAware; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** *

    Serializes validation and action errors into JSON. This interceptor does not @@ -65,8 +65,7 @@ import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; * use this interceptor

    */ public class JSONValidationInterceptor extends MethodFilterInterceptor { - private static final Log LOG = LogFactory - .getLog(JSONValidationInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(JSONValidationInterceptor.class); private static final String VALIDATE_ONLY_PARAM = "struts.validateOnly"; private static final String VALIDATE_JSON_PARAM = "struts.enableJSONValidation"; diff --git a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java index 93702580d..f59ae6c40 100644 --- a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java +++ b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java @@ -25,10 +25,9 @@ import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -38,7 +37,7 @@ import com.opensymphony.xwork2.Action; */ public class IteratorGenerator implements Iterator, Action { - private static final Log _log = LogFactory.getLog(IteratorGenerator.class); + private static final Logger LOG = LoggerFactory.getLogger(IteratorGenerator.class); List values; Object value; @@ -93,7 +92,7 @@ public class IteratorGenerator implements Iterator, Action { values.add(convertedObj); } catch(Exception e) { // make sure things, goes on, we just ignore the bad ones - _log.warn("unable to convert ["+token+"], skipping this token, it will not appear in the generated iterator", e); + LOG.warn("unable to convert ["+token+"], skipping this token, it will not appear in the generated iterator", e); } } else { diff --git a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java index b5563e32c..8079af7db 100644 --- a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java @@ -26,9 +26,8 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -67,7 +66,7 @@ public class SortIteratorFilter extends IteratorFilterSupport implements Iterato } else { try { if (!MakeIterator.isIterable(source)) { - LogFactory.getLog(SortIteratorFilter.class.getName()).warn("Cannot create SortIterator for source " + source); + LoggerFactory.getLogger(SortIteratorFilter.class.getName()).warn("Cannot create SortIterator for source " + source); return ERROR; } @@ -86,7 +85,7 @@ public class SortIteratorFilter extends IteratorFilterSupport implements Iterato return SUCCESS; } catch (Exception e) { - LogFactory.getLog(SortIteratorFilter.class.getName()).warn("Error creating sort iterator.", e); + LoggerFactory.getLogger(SortIteratorFilter.class.getName()).warn("Error creating sort iterator.", e); return ERROR; } diff --git a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java index 2aef5daaa..973984c5c 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java @@ -39,16 +39,16 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.jsp.ui.OgnlTool; import org.apache.struts2.views.util.UrlHelper; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -57,7 +57,7 @@ import com.opensymphony.xwork2.ObjectFactory; */ public class StrutsUtil { - protected static final Log log = LogFactory.getLog(StrutsUtil.class); + protected static final Logger LOG = LoggerFactory.getLogger(StrutsUtil.class); protected HttpServletRequest request; diff --git a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java index 5451bb9da..90475f338 100644 --- a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java @@ -24,10 +24,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -36,7 +35,7 @@ import com.opensymphony.xwork2.Action; */ public class SubsetIteratorFilter extends IteratorFilterSupport implements Iterator, Action { - private static final Log _log = LogFactory.getLog(SubsetIteratorFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(SubsetIteratorFilter.class); Iterator iterator; Object source; @@ -69,7 +68,7 @@ public class SubsetIteratorFilter extends IteratorFilterSupport implements Itera // Action implementation ----------------------------------------- public String execute() { if (source == null) { - LogFactory.getLog(SubsetIteratorFilter.class.getName()).warn("Source is null returning empty set."); + LoggerFactory.getLogger(SubsetIteratorFilter.class.getName()).warn("Source is null returning empty set."); return ERROR; } @@ -167,7 +166,7 @@ public class SubsetIteratorFilter extends IteratorFilterSupport implements Itera return okToAdd; } catch(Exception e) { - _log.warn("decider ["+decider+"] encountered an error while decide adding element ["+element+"], element will be ignored, it will not appeared in subseted iterator", e); + LOG.warn("decider ["+decider+"] encountered an error while decide adding element ["+element+"], element will be ignored, it will not appeared in subseted iterator", e); return false; } } diff --git a/core/src/main/java/org/apache/struts2/util/TokenHelper.java b/core/src/main/java/org/apache/struts2/util/TokenHelper.java index 87b3c38aa..4a15a07fa 100644 --- a/core/src/main/java/org/apache/struts2/util/TokenHelper.java +++ b/core/src/main/java/org/apache/struts2/util/TokenHelper.java @@ -24,11 +24,10 @@ import java.math.BigInteger; import java.util.Map; import java.util.Random; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.LocalizedTextUtil; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * TokenHelper @@ -45,7 +44,7 @@ public class TokenHelper { * The name of the field which will hold the token name */ public static final String TOKEN_NAME_FIELD = "struts.token.name"; - private static final Log LOG = LogFactory.getLog(TokenHelper.class); + private static final Logger LOG = LoggerFactory.getLogger(TokenHelper.class); private static final Random RANDOM = new Random(); diff --git a/core/src/main/java/org/apache/struts2/validators/DWRValidator.java b/core/src/main/java/org/apache/struts2/validators/DWRValidator.java index 624a18aa5..687b700a2 100644 --- a/core/src/main/java/org/apache/struts2/validators/DWRValidator.java +++ b/core/src/main/java/org/apache/struts2/validators/DWRValidator.java @@ -27,8 +27,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.dispatcher.ApplicationMap; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.RequestMap; @@ -46,6 +44,8 @@ import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** *

    @@ -65,7 +65,7 @@ import com.opensymphony.xwork2.inject.Inject; * */ public class DWRValidator { - private static final Log LOG = LogFactory.getLog(DWRValidator.class); + private static final Logger LOG = LoggerFactory.getLogger(DWRValidator.class); private ActionProxyFactory actionProxyFactory; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index f844c9b58..6f5b9c211 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -35,8 +35,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.JspSupportServlet; import org.apache.struts2.views.TagLibrary; @@ -46,6 +44,8 @@ import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.FileManager; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import freemarker.cache.FileTemplateLoader; import freemarker.cache.MultiTemplateLoader; @@ -101,7 +101,7 @@ import freemarker.template.TemplateModel; */ public class FreemarkerManager { - private static final Log LOG = LogFactory.getLog(FreemarkerManager.class); + private static final Logger LOG = LoggerFactory.getLogger(FreemarkerManager.class); public static final String CONFIG_SERVLET_CONTEXT_KEY = "freemarker.Configuration"; public static final String KEY_EXCEPTION = "exception"; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java index a9bc29578..c84227016 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java @@ -29,13 +29,13 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.Component; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import freemarker.template.DefaultObjectWrapper; import freemarker.template.SimpleNumber; @@ -45,7 +45,7 @@ import freemarker.template.TemplateModelException; import freemarker.template.TemplateTransformModel; public abstract class TagModel implements TemplateTransformModel { - private static final Log LOG = LogFactory.getLog(TagModel.class); + private static final Logger LOG = LoggerFactory.getLogger(TagModel.class); protected ValueStack stack; protected HttpServletRequest req; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java index 34731ab3f..98a56cb51 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java @@ -23,12 +23,12 @@ package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.Bean; import org.apache.struts2.components.Component; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -38,7 +38,7 @@ public class BeanTag extends ContextBeanTag { private static final long serialVersionUID = -3863152522071209267L; - protected static Log log = LogFactory.getLog(BeanTag.class); + protected static Logger LOG = LoggerFactory.getLogger(BeanTag.class); protected String name; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java index 428f446a6..69c0d0ea0 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java @@ -22,14 +22,15 @@ package org.apache.struts2.views.jsp.iterator; import javax.servlet.jsp.JspException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.IteratorGenerator; import org.apache.struts2.util.IteratorGenerator.Converter; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.jsp.StrutsBodyTagSupport; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * @@ -132,7 +133,7 @@ public class IteratorGeneratorTag extends StrutsBodyTagSupport { public static final String DEFAULT_SEPARATOR = ","; - private static final Log _log = LogFactory.getLog(IteratorGeneratorTag.class); + private static final Logger LOG = LoggerFactory.getLogger(IteratorGeneratorTag.class); String countAttr; String separatorAttr; @@ -213,7 +214,7 @@ public class IteratorGeneratorTag extends StrutsBodyTagSupport { count = Integer.parseInt((String)countObj); } catch(NumberFormatException e) { - _log.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e); + LOG.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e); } } } diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java index 9584cd5b9..d6498158b 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java @@ -22,14 +22,15 @@ package org.apache.struts2.views.jsp.iterator; import javax.servlet.jsp.JspException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.SubsetIteratorFilter; import org.apache.struts2.util.SubsetIteratorFilter.Decider; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.jsp.StrutsBodyTagSupport; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * @@ -153,7 +154,7 @@ public class SubsetIteratorTag extends StrutsBodyTagSupport { private static final long serialVersionUID = -6252696081713080102L; - private static final Log _log = LogFactory.getLog(SubsetIteratorTag.class); + private static final Logger LOG = LoggerFactory.getLogger(SubsetIteratorTag.class); String countAttr; String sourceAttr; @@ -230,7 +231,7 @@ public class SubsetIteratorTag extends StrutsBodyTagSupport { count = Integer.parseInt((String)countObj); } catch(NumberFormatException e) { - _log.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e); + LOG.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e); } } } @@ -256,7 +257,7 @@ public class SubsetIteratorTag extends StrutsBodyTagSupport { start = Integer.parseInt((String)startObj); } catch(NumberFormatException e) { - _log.warn("unable to convert count attribute ["+startObj+"] to number, ignore count attribute", e); + LOG.warn("unable to convert count attribute ["+startObj+"] to number, ignore count attribute", e); } } } diff --git a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java index b31970016..019b28872 100644 --- a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java +++ b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java @@ -33,8 +33,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; @@ -42,6 +40,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -49,7 +49,7 @@ import com.opensymphony.xwork2.util.ValueStack; * */ public class UrlHelper { - private static final Log LOG = LogFactory.getLog(UrlHelper.class); + private static final Logger LOG = LoggerFactory.getLogger(UrlHelper.class); /** * Default HTTP port (80). diff --git a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java index 30f09e713..f8783c670 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java @@ -37,8 +37,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsException; @@ -58,6 +56,8 @@ import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -65,7 +65,7 @@ import com.opensymphony.xwork2.util.ValueStack; * */ public class VelocityManager { - private static final Log log = LogFactory.getLog(VelocityManager.class); + private static final Logger LOG = LoggerFactory.getLogger(VelocityManager.class); public static final String STRUTS = "struts"; private ObjectFactory objectFactory; @@ -185,7 +185,7 @@ public class VelocityManager { ctx = ServletActionContext.getServletContext(); } catch (NullPointerException npe) { // in case this was used outside the lifecycle of struts servlet - log.debug("internal toolbox context ignored"); + LOG.debug("internal toolbox context ignored"); } if (toolboxManager != null && ctx != null) { @@ -219,7 +219,7 @@ public class VelocityManager { VelocityContext velocityContext = (VelocityContext) objectFactory.buildBean(className, null); contextList.add(velocityContext); } catch (Exception e) { - log.warn("Warning. " + e.getClass().getName() + " caught while attempting to instantiate a chained VelocityContext, " + className + " -- skipping"); + LOG.warn("Warning. " + e.getClass().getName() + " caught while attempting to instantiate a chained VelocityContext, " + className + " -- skipping"); } } if (contextList.size() > 0) { @@ -258,7 +258,7 @@ public class VelocityManager { public Properties loadConfiguration(ServletContext context) { if (context == null) { String gripe = "Error attempting to create a loadConfiguration from a null ServletContext!"; - log.error(gripe); + LOG.error(gripe); throw new IllegalArgumentException(gripe); } @@ -326,11 +326,11 @@ public class VelocityManager { // if we've got something, load 'er up if (in != null) { - log.info("Initializing velocity using " + resourceLocation); + LOG.info("Initializing velocity using " + resourceLocation); properties.load(in); } } catch (IOException e) { - log.warn("Unable to load velocity configuration " + resourceLocation, e); + LOG.warn("Unable to load velocity configuration " + resourceLocation, e); } finally { if (in != null) { try { @@ -361,16 +361,16 @@ public class VelocityManager { // for debugging purposes, allows users to dump out the properties that have been configured - if (log.isDebugEnabled()) { - log.debug("Initializing Velocity with the following properties ..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Initializing Velocity with the following properties ..."); for (Iterator iter = properties.keySet().iterator(); iter.hasNext();) { String key = (String) iter.next(); String value = properties.getProperty(key); - if (log.isDebugEnabled()) { - log.debug(" '" + key + "' = '" + value + "'"); + if (LOG.isDebugEnabled()) { + LOG.debug(" '" + key + "' = '" + value + "'"); } } } @@ -455,7 +455,7 @@ public class VelocityManager { protected VelocityEngine newVelocityEngine(ServletContext context) { if (context == null) { String gripe = "Error attempting to create a new VelocityEngine from a null ServletContext!"; - log.error(gripe); + LOG.error(gripe); throw new IllegalArgumentException(gripe); } diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java index f90dad1b2..60b3d4272 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java @@ -24,8 +24,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsException; import org.w3c.dom.DOMException; import org.w3c.dom.Document; @@ -34,6 +32,9 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.UserDataHandler; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * AbstractAdapterNode is the base for childAdapters that expose a read-only view * of a Java object as a DOM Node. This class implements the core parent-child @@ -80,7 +81,7 @@ public abstract class AbstractAdapterNode implements AdapterNode { }; private List childAdapters; - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); // The domain object that we are adapting private Object propertyValue; @@ -90,8 +91,8 @@ public abstract class AbstractAdapterNode implements AdapterNode { public AbstractAdapterNode() { - if (LogFactory.getLog(getClass()).isDebugEnabled()) { - LogFactory.getLog(getClass()).debug("Creating " + this); + if (LoggerFactory.getLogger(getClass()).isDebugEnabled()) { + LoggerFactory.getLogger(getClass()).debug("Creating " + this); } } diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java index e35eb93a7..12335ba16 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java @@ -23,16 +23,17 @@ package org.apache.struts2.views.xslt; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.w3c.dom.Node; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** */ public class ArrayAdapter extends AbstractAdapterElement { - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); public ArrayAdapter() { } diff --git a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java index ea4a79bd0..2e3b18dd8 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java @@ -30,12 +30,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * This class is the most general type of adapter, utilizing reflective introspection to present a DOM view of all of @@ -64,7 +65,7 @@ public class BeanAdapter extends AbstractAdapterElement { //~ Instance fields //////////////////////////////////////////////////////// - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); //~ Constructors /////////////////////////////////////////////////////////// @@ -121,7 +122,7 @@ public class BeanAdapter extends AbstractAdapterElement { } catch (Exception e) { if (e instanceof InvocationTargetException) e = (Exception) ((InvocationTargetException) e).getTargetException(); - log.error(e); + log.error("Cannot access bean property: "+propertyName, e); continue; } diff --git a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java index af7f85ca7..dc6629863 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java @@ -24,16 +24,17 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.w3c.dom.Node; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** */ public class CollectionAdapter extends AbstractAdapterElement { - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); public CollectionAdapter() { } diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java index ba02bbad6..2e13f6d12 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java @@ -23,8 +23,6 @@ package org.apache.struts2.views.xslt; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Element; @@ -32,6 +30,9 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.TypeInfo; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * ProxyElementAdapter is a pass-through adapter for objects which already * implement the Element interface. All methods are proxied to the underlying @@ -43,7 +44,7 @@ import org.w3c.dom.TypeInfo; */ public class ProxyElementAdapter extends ProxyNodeAdapter implements Element { - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); public ProxyElementAdapter(AdapterFactory factory, AdapterNode parent, Element value) { super(factory, parent, value); diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java index 3f54951cd..4a1b6338e 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java @@ -20,12 +20,13 @@ */ package org.apache.struts2.views.xslt; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.w3c.dom.DOMException; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * ProxyNodeAdapter is a read-only delegating adapter for objects which already * implement the Node interface. All methods are proxied to the underlying @@ -34,7 +35,7 @@ import org.w3c.dom.Node; */ public abstract class ProxyNodeAdapter extends AbstractAdapterNode { - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); public ProxyNodeAdapter(AdapterFactory factory, AdapterNode parent, Node value) { setContext(factory, parent, "document"/*propname unused*/, value); diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java index b18b513c2..e0d54b23d 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java @@ -28,8 +28,8 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFactory; */ public class ServletURIResolver implements URIResolver { - private Log log = LogFactory.getLog(getClass()); + private Logger log = LoggerFactory.getLogger(getClass()); static final String PROTOCOL = "response:"; private ServletContext sc; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java index 845db5a9d..b6157eae0 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java @@ -22,14 +22,15 @@ package org.apache.struts2.views.xslt; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + public class SimpleNodeList implements NodeList { - private Log log = LogFactory.getLog(SimpleNodeList.class); + private Logger log = LoggerFactory.getLogger(SimpleNodeList.class); private List nodes; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java index 13497b773..2c7c3e038 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java @@ -24,14 +24,12 @@ import java.io.StringReader; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.w3c.dom.Node; - import org.xml.sax.InputSource; import com.opensymphony.xwork2.util.DomHelper; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * StringAdapter adapts a Java String value to a DOM Element with the specified @@ -48,7 +46,7 @@ import com.opensymphony.xwork2.util.DomHelper; */ public class StringAdapter extends AbstractAdapterElement { - private Log log = LogFactory.getLog(this.getClass()); + private Logger log = LoggerFactory.getLogger(this.getClass()); boolean parseStringAsXML; public StringAdapter() { diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java index 6495c0b85..38a8d08ae 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java @@ -39,8 +39,6 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; @@ -50,6 +48,8 @@ import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -207,7 +207,7 @@ public class XSLTResult implements Result { private static final long serialVersionUID = 6424691441777176763L; /** Log instance for this result. */ - private static final Log LOG = LogFactory.getLog(XSLTResult.class); + private static final Logger LOG = LoggerFactory.getLogger(XSLTResult.class); /** 'stylesheetLocation' parameter. Points to the xsl. */ public static final String DEFAULT_PARAM = "stylesheetLocation"; diff --git a/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java b/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java index 9665b64ae..5640c0112 100644 --- a/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java +++ b/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java @@ -20,10 +20,9 @@ */ package org.apache.struts2; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -34,7 +33,7 @@ public class ExecutionCountTestAction extends ActionSupport { private static final long serialVersionUID = -2954211394678430609L; - private static final Log LOG = LogFactory.getLog(ExecutionCountTestAction.class); + private static final Logger LOG = LoggerFactory.getLogger(ExecutionCountTestAction.class); private int executionCount = 0; diff --git a/core/src/test/java/org/apache/struts2/TestResult.java b/core/src/test/java/org/apache/struts2/TestResult.java index 538a288fc..f65ab0f3c 100644 --- a/core/src/test/java/org/apache/struts2/TestResult.java +++ b/core/src/test/java/org/apache/struts2/TestResult.java @@ -25,13 +25,12 @@ import java.util.List; import junit.framework.Assert; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -43,7 +42,7 @@ public class TestResult implements Result { private static final long serialVersionUID = -4429258122011663164L; - private static final Log LOG = LogFactory.getLog(TestResult.class); + private static final Logger LOG = LoggerFactory.getLogger(TestResult.class); private List expectedValues = new ArrayList(); diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java index cf42a6d0f..38cc257f5 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java @@ -34,19 +34,19 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.views.jsp.ui.AbstractUITag; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** */ public abstract class AbstractUITagTest extends AbstractTagTest { - private static final Log LOG = LogFactory.getLog(AbstractUITagTest.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractUITagTest.class); static final String FREEMARKER_ERROR_EXPECTATION = "Java backtrace for programmers:"; diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java b/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java index 294435139..ef04f86d5 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java @@ -22,7 +22,6 @@ package org.apache.struts2.codebehind; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; @@ -31,8 +30,6 @@ import java.util.Map; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.util.ClassLoaderUtils; import com.opensymphony.xwork2.Action; @@ -50,6 +47,8 @@ import com.opensymphony.xwork2.config.entities.ResultConfig; import com.opensymphony.xwork2.config.entities.ResultTypeConfig; import com.opensymphony.xwork2.config.providers.InterceptorBuilder; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Uses code-behind conventions to solve the two unknown problems. @@ -63,7 +62,7 @@ public class CodebehindUnknownHandler implements UnknownHandler { protected Configuration configuration; protected ObjectFactory objectFactory; - protected static final Log LOG = LogFactory.getLog(CodebehindUnknownHandler.class); + protected static final Logger LOG = LoggerFactory.getLogger(CodebehindUnknownHandler.class); @Inject public CodebehindUnknownHandler(@Inject("struts.codebehind.defaultPackage") String defaultPackage, diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java index 7cc3539fc..8c519ddec 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java @@ -24,13 +24,11 @@ import java.beans.PropertyDescriptor; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; /** @@ -48,7 +46,7 @@ public class ShowConfigAction extends ActionNamesAction { private Set actionNames; private String detailView = "results"; private PropertyDescriptor[] properties; - private static Log log = LogFactory.getLog(ShowConfigAction.class); + private static Logger LOG = LoggerFactory.getLogger(ShowConfigAction.class); private ConfigurationHelper configHelper; private ObjectFactory objectFactory; @@ -118,7 +116,7 @@ public class ShowConfigAction extends ActionNamesAction { Class clazz = objectFactory.getClassInstance(getConfig().getClassName()); properties = reflectionProvider.getPropertyDescriptors(clazz); } catch (Exception e) { - log.error("Unable to get properties for action " + actionName, e); + LOG.error("Unable to get properties for action " + actionName, e); addActionError("Unable to retrieve action properties: " + e.toString()); } diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java index 4c4db8d9c..105ca13d8 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java @@ -29,10 +29,9 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory; import com.opensymphony.xwork2.util.reflection.ReflectionException; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; @@ -45,7 +44,7 @@ import com.opensymphony.xwork2.validator.Validator; public class ShowValidatorAction extends ListValidatorsAction { private static final long serialVersionUID = 4061534149317835177L; - private static Log log = LogFactory.getLog(ShowValidatorAction.class); + private static Logger LOG = LoggerFactory.getLogger(ShowValidatorAction.class); Set properties = Collections.EMPTY_SET; int selected = 0; @@ -89,7 +88,7 @@ public class ShowValidatorAction extends ListValidatorsAction { try { beanInfoFrom = Introspector.getBeanInfo(validator.getClass(), Object.class); } catch (IntrospectionException e) { - log.error("An error occurred", e); + LOG.error("An error occurred", e); addActionError("An error occurred while introspecting a validator of type " + validator.getClass().getName()); return ERROR; } @@ -112,7 +111,7 @@ public class ShowValidatorAction extends ListValidatorsAction { properties.add(new PropertyInfo(name, pd.getPropertyType(), value)); } } catch (Exception e) { - log.warn("Unable to retrieve properties.", e); + LOG.warn("Unable to retrieve properties.", e); addActionError("Unable to retrieve properties: " + e.toString()); } diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java index 8fbf83251..ecd970bc7 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java @@ -31,14 +31,14 @@ import java.util.Random; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.UIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.annotations.StrutsTagSkipInheritance; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -174,7 +174,7 @@ public class DateTimePicker extends UIBean { final public static String TEMPLATE = "datetimepicker"; final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss"); - final protected static Log LOG = LogFactory.getLog(DateTimePicker.class); + final protected static Logger LOG = LoggerFactory.getLogger(DateTimePicker.class); protected String iconPath; protected String formatLength; @@ -393,7 +393,7 @@ public class DateTimePicker extends UIBean { formats.add(displayFormat); } catch (Exception e) { // don't use it then (this attribute is used by Dojo, not java code) - LOG.error(e); + LOG.error("Cannot use attribute", e); } } diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java index c34b05f15..20250ae22 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java @@ -26,8 +26,6 @@ import java.util.Random; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.Form; import org.apache.struts2.components.FormButton; import org.apache.struts2.views.annotations.StrutsTag; @@ -35,6 +33,8 @@ import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.annotations.StrutsTagSkipInheritance; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -126,7 +126,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name="submit", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.SubmitTag", description="Render a submit button") public class Submit extends FormButton implements RemoteBean { - private static final Log LOG = LogFactory.getLog(Submit.class); + private static final Logger LOG = LoggerFactory.getLogger(Submit.class); final public static String TEMPLATE = "submit"; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java index fe68162d2..436fca518 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java @@ -34,18 +34,18 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.views.jsp.ui.AbstractUITag; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** */ public abstract class AbstractUITagTest extends AbstractTagTest { - private static final Log LOG = LogFactory.getLog(AbstractUITagTest.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractUITagTest.class); static final String FREEMARKER_ERROR_EXPECTATION = "Java backtrace for programmers:"; diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index d193e9683..a55ebdb3e 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -32,7 +32,14 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sf.jasperreports.engine.*; +import net.sf.jasperreports.engine.JRException; +import net.sf.jasperreports.engine.JRExporter; +import net.sf.jasperreports.engine.JRExporterParameter; +import net.sf.jasperreports.engine.JRParameter; +import net.sf.jasperreports.engine.JasperExportManager; +import net.sf.jasperreports.engine.JasperFillManager; +import net.sf.jasperreports.engine.JasperPrint; +import net.sf.jasperreports.engine.JasperReport; import net.sf.jasperreports.engine.export.JRCsvExporter; import net.sf.jasperreports.engine.export.JRCsvExporterParameter; import net.sf.jasperreports.engine.export.JRHtmlExporter; @@ -42,14 +49,14 @@ import net.sf.jasperreports.engine.export.JRXlsExporter; import net.sf.jasperreports.engine.export.JRXmlExporter; import net.sf.jasperreports.engine.util.JRLoader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.opensymphony.xwork2.util.TextUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.StrutsResultSupport; + import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -122,7 +129,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe private static final long serialVersionUID = -2523174799621182907L; - private final static Log LOG = LogFactory.getLog(JasperReportsResult.class); + private final static Logger LOG = LoggerFactory.getLogger(JasperReportsResult.class); protected String dataSource; diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java index d5a703a85..1fb5a3fae 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java @@ -20,15 +20,17 @@ */ package org.apache.struts2.views.jasperreports; -import org.apache.struts2.util.MakeIterator; -import com.opensymphony.xwork2.util.ValueStack; +import java.util.Iterator; + import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRField; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import java.util.Iterator; +import org.apache.struts2.util.MakeIterator; + +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Ported to Struts. @@ -39,7 +41,7 @@ public class ValueStackDataSource implements JRDataSource { /** * Logger for this class */ - private static Log log = LogFactory.getLog(ValueStackDataSource.class); + private static Logger LOG = LoggerFactory.getLogger(ValueStackDataSource.class); Iterator iterator; @@ -67,7 +69,7 @@ public class ValueStackDataSource implements JRDataSource { iterator = MakeIterator.convert(array); } } else { - log.warn("Data source value for data source " + dataSource + " was null"); + LOG.warn("Data source value for data source " + dataSource + " was null"); } } @@ -96,8 +98,8 @@ public class ValueStackDataSource implements JRDataSource { Object value = valueStack.findValue(expression); - if (log.isDebugEnabled()) { - log.debug("field: " + field.getName() + "/" + value); + if (LOG.isDebugEnabled()) { + LOG.debug("field: " + field.getName() + "/" + value); } if (MakeIterator.isIterable(value)) { @@ -125,11 +127,11 @@ public class ValueStackDataSource implements JRDataSource { if ((iterator != null) && (iterator.hasNext())) { valueStack.push(iterator.next()); - log.debug("Pushed next value: " + valueStack.findValue(".")); + LOG.debug("Pushed next value: " + valueStack.findValue(".")); return true; } else { - log.debug("No more values"); + LOG.debug("No more values"); return false; } diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java index a769269e9..7453fb08f 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java @@ -26,10 +26,9 @@ import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; import javax.faces.lifecycle.Lifecycle; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Provides common lifecycle phase methods needed by interceptors and results. @@ -39,7 +38,7 @@ public class FacesSupport { private static final String LIFECYCLE_KEY = "lifecycle"; /** Log instance for each class */ - protected Log log; + protected Logger log; /** * Marker key for the ActionContext to dictate whether to treat the request @@ -49,7 +48,7 @@ public class FacesSupport { /** Initializes log instance for the instance object */ protected FacesSupport() { - log = LogFactory.getLog(getClass()); + log = LoggerFactory.getLogger(getClass()); } /** diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java index 234340d3b..f6ff1302b 100644 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java +++ b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java @@ -20,15 +20,8 @@ */ package org.apache.struts2.dispatcher.multipart; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.StrutsConstants; - -import com.opensymphony.xwork2.inject.Inject; - import http.utils.multipartrequest.ServletMultipartRequest; -import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -37,6 +30,14 @@ import java.util.Collections; import java.util.Enumeration; import java.util.List; +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts2.StrutsConstants; + +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * Multipart form data request adapter for Jason Pell's multipart utils package. @@ -44,7 +45,7 @@ import java.util.List; */ public class PellMultiPartRequest implements MultiPartRequest { - private static final Log LOG = LogFactory.getLog(PellMultiPartRequest.class); + private static final Logger LOG = LoggerFactory.getLogger(PellMultiPartRequest.class); private ServletMultipartRequest multi; private String defaultEncoding; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java index c4ac104ee..dd5f6a7be 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java @@ -33,15 +33,16 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.PlexusContainer; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * Creates a plexus container for the application, session, and request */ public class PlexusFilter implements Filter { - private static final Log log = LogFactory.getLog(PlexusObjectFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class); private static final String CHILD_CONTAINER_NAME = "request"; private static boolean loaded = false; @@ -80,7 +81,7 @@ public class PlexusFilter implements Filter { } if (parent.hasChildContainer(CHILD_CONTAINER_NAME)) { - log.warn("Plexus container (scope: request) alredy exist."); + LOG.warn("Plexus container (scope: request) alredy exist."); child = parent.getChildContainer(CHILD_CONTAINER_NAME); } else { child = parent.createChildContainer(CHILD_CONTAINER_NAME, Collections.EMPTY_LIST, Collections.EMPTY_MAP); @@ -90,7 +91,7 @@ public class PlexusFilter implements Filter { } PlexusThreadLocal.setPlexusContainer(child); } catch (Exception e) { - log.error("Error initializing plexus container (scope: request)", e); + LOG.error("Error initializing plexus container (scope: request)", e); } chain.doFilter(req, res); @@ -102,7 +103,7 @@ public class PlexusFilter implements Filter { } PlexusThreadLocal.setPlexusContainer(null); } catch (Exception e) { - log.error("Error disposing plexus container (scope: request)", e); + LOG.error("Error disposing plexus container (scope: request)", e); } } } diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java index ad2eac3fc..e101a4818 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java @@ -29,16 +29,17 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.PlexusContainer; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * Manages the Plexus lifecycle for the servlet and session contexts */ public class PlexusLifecycleListener implements ServletContextListener, HttpSessionListener { - private static final Log log = LogFactory.getLog(PlexusObjectFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class); private static boolean loaded = false; public static final String KEY = "struts.plexus.container"; @@ -65,7 +66,7 @@ public class PlexusLifecycleListener implements ServletContextListener, HttpSess pc.initialize(); pc.start(); } catch (Exception e) { - log.error("Error initializing plexus container (scope: application)", e); + LOG.error("Error initializing plexus container (scope: application)", e); } } @@ -78,7 +79,7 @@ public class PlexusLifecycleListener implements ServletContextListener, HttpSess PlexusContainer pc = (PlexusContainer) ctx.getAttribute(KEY); pc.dispose(); } catch (Exception e) { - log.error("Error disposing plexus container (scope: application)", e); + LOG.error("Error disposing plexus container (scope: application)", e); } } @@ -96,7 +97,7 @@ public class PlexusLifecycleListener implements ServletContextListener, HttpSess child.initialize(); child.start(); } catch (Exception e) { - log.error("Error initializing plexus container (scope: session)", e); + LOG.error("Error initializing plexus container (scope: session)", e); } } @@ -109,7 +110,7 @@ public class PlexusLifecycleListener implements ServletContextListener, HttpSess PlexusContainer child = (PlexusContainer) session.getAttribute(KEY); child.dispose(); } catch (Exception e) { - log.error("Error initializing plexus container (scope: session)", e); + LOG.error("Error initializing plexus container (scope: session)", e); } } } diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java index adaf10faf..8b9ec85c8 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java @@ -25,8 +25,6 @@ import java.util.Map; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.PlexusContainer; import com.opensymphony.xwork2.Action; @@ -38,6 +36,8 @@ import com.opensymphony.xwork2.config.entities.InterceptorConfig; import com.opensymphony.xwork2.config.entities.ResultConfig; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.validator.Validator; /** @@ -70,7 +70,7 @@ import com.opensymphony.xwork2.validator.Validator; * @author Emmanuel Venisse */ public class PlexusObjectFactory extends ObjectFactory { - private static final Log log = LogFactory.getLog(PlexusObjectFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class); private static final String PLEXUS_COMPONENT_TYPE = "plexus.component.type"; @@ -105,7 +105,7 @@ public class PlexusObjectFactory extends ObjectFactory { " \n" + " org.apache.struts2.plexus.PlexusLifecycleListener\n" + " "; - log.fatal(message); + LOG.fatal(message); return; } @@ -293,7 +293,7 @@ public class PlexusObjectFactory extends ObjectFactory { return pc.lookup(role, roleHint); } catch (Exception e) { - log.debug("Can't load component (" + role + "/" + roleHint + ") with plexus, try now with struts.", e); + LOG.debug("Can't load component (" + role + "/" + roleHint + ") with plexus, try now with struts.", e); Object o = super.buildBean(super.getClassInstance(role), extraContext); pc.autowire(o); return o; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java index 03506cebb..15337b144 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java @@ -24,16 +24,17 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.InputStreamReader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.configuration.PlexusConfigurationResourceException; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * Utility methods for dealing with Plexus */ public class PlexusUtils { - private static final Log log = LogFactory.getLog(PlexusObjectFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class); /** * Configures the container with the configuration file @@ -45,7 +46,7 @@ public class PlexusUtils { public static void configure(PlexusContainer pc, String file) throws PlexusConfigurationResourceException { InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(file); if (is == null) { - log.info("Could not find " + file + ", skipping"); + LOG.info("Could not find " + file + ", skipping"); is = new ByteArrayInputStream("".getBytes()); } pc.setConfigurationResource(new InputStreamReader(is)); diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java index 8dd520c66..58888d738 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java @@ -23,13 +23,12 @@ package org.apache.struts2.portlet; import java.util.AbstractMap; import java.util.Enumeration; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import javax.portlet.PortletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * A simple implementation of the {@link java.util.Map} interface to handle a collection of request attributes. @@ -37,7 +36,7 @@ import org.apache.commons.logging.LogFactory; */ public class PortletRequestMap extends AbstractMap { - private static final Log LOG = LogFactory.getLog(PortletRequestMap.class); + private static final Logger LOG = LoggerFactory.getLogger(PortletRequestMap.class); private Set entries = null; private PortletRequest request = null; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java index 56f518117..eb6ce976e 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java @@ -29,8 +29,8 @@ import java.util.Set; import javax.portlet.PortletRequest; import javax.portlet.PortletSession; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * A simple implementation of the {@link java.util.Map} interface to handle a collection of portlet session @@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFactory; */ public class PortletSessionMap extends AbstractMap { - private static final Log LOG = LogFactory.getLog(PortletSessionMap.class); + private static final Logger LOG = LoggerFactory.getLogger(PortletSessionMap.class); private PortletSession session = null; private Set entries = null; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java index 4b961bee4..e7741420c 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java @@ -41,8 +41,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsException; import org.apache.struts2.StrutsStatics; @@ -70,6 +68,8 @@ import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.util.FileManager; import com.opensymphony.xwork2.util.LocalizedTextUtil; import com.opensymphony.xwork2.util.TextUtils; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -164,7 +164,7 @@ import com.opensymphony.xwork2.util.TextUtils; public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics, PortletActionConstants { - private static final Log LOG = LogFactory.getLog(Jsr168Dispatcher.class); + private static final Logger LOG = LoggerFactory.getLogger(Jsr168Dispatcher.class); private ActionProxyFactory factory = null; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java index 44b61844d..1c01dbe27 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java @@ -24,8 +24,6 @@ import javax.portlet.PortletContext; import javax.portlet.PortletRequest; import javax.portlet.PortletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsStatics; import org.apache.struts2.interceptor.PrincipalAware; import org.apache.struts2.portlet.PortletActionConstants; @@ -33,12 +31,14 @@ import org.apache.struts2.portlet.PortletActionConstants; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; public class PortletAwareInterceptor extends AbstractInterceptor implements PortletActionConstants, StrutsStatics { private static final long serialVersionUID = 2476509721059587700L; - private static final Log LOG = LogFactory.getLog(PortletAwareInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(PortletAwareInterceptor.class); /** * Sets action properties based on the interfaces an action implements. Things like application properties, diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java index a8662ea37..ae69934ab 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java @@ -25,8 +25,6 @@ import java.util.Map; import javax.portlet.ActionResponse; import javax.portlet.RenderRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction; @@ -35,10 +33,12 @@ import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import com.opensymphony.xwork2.util.CompoundRoot; import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; public class PortletStateInterceptor extends AbstractInterceptor implements PortletActionConstants { - private final static Log LOG = LogFactory.getLog(PortletStateInterceptor.class); + private final static Logger LOG = LoggerFactory.getLogger(PortletStateInterceptor.class); private static final long serialVersionUID = 6138452063353911784L; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java index 693c58901..5058283a7 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java @@ -36,8 +36,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.StrutsResultSupport; import org.apache.struts2.portlet.PortletActionConstants; @@ -46,6 +44,8 @@ import org.apache.struts2.portlet.context.PortletActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.TextUtils; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Result type that includes a JSP to render. @@ -62,7 +62,7 @@ public class PortletResult extends StrutsResultSupport implements PortletActionC /** * Logger instance. */ - private static final Log LOG = LogFactory.getLog(PortletResult.class); + private static final Logger LOG = LoggerFactory.getLogger(PortletResult.class); private String contentType = "text/html"; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java index 7d8f2f8b5..c0483f258 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java @@ -20,13 +20,10 @@ */ package org.apache.struts2.portlet.result; -import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; import javax.portlet.ActionResponse; -import javax.portlet.PortletException; -import javax.portlet.PortletRequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -34,8 +31,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspFactory; import javax.servlet.jsp.PageContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.StrutsResultSupport; @@ -51,6 +46,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * @@ -94,8 +91,7 @@ public class PortletVelocityResult extends StrutsResultSupport { private static final long serialVersionUID = -8241086555872212274L; - private static final Log log = LogFactory - .getLog(PortletVelocityResult.class); + private static final Logger LOG = LoggerFactory.getLogger(PortletVelocityResult.class); private String defaultEncoding; private VelocityManager velocityManager; @@ -208,7 +204,7 @@ public class PortletVelocityResult extends StrutsResultSupport { // deprecated, we'll oblige :) writer.flush(); } catch (Exception e) { - log.error("Unable to render Velocity Template, '" + finalLocation + LOG.error("Unable to render Velocity Template, '" + finalLocation + "'", e); throw e; } finally { diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java index 73e145a59..4b4eaa789 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java @@ -34,12 +34,13 @@ import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.WindowState; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsException; import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.context.PortletActionContext; + import com.opensymphony.xwork2.util.TextUtils; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Helper class for creating Portlet URLs. Portlet URLs are fundamentally different from regular @@ -52,7 +53,7 @@ import com.opensymphony.xwork2.util.TextUtils; public class PortletUrlHelper { public static final String ENCODING = "UTF-8"; - private static final Log LOG = LogFactory.getLog(PortletUrlHelper.class); + private static final Logger LOG = LoggerFactory.getLogger(PortletUrlHelper.class); /** * Create a portlet URL with for the specified action and namespace. diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java index c6075f981..50abd34a9 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java @@ -26,11 +26,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.Writer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsException; import org.apache.struts2.sitegraph.renderers.DOTRenderer; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** * // START SNIPPET: javadocs-intro * SiteGraph is a tool that renders out GraphViz-generated images depicting your @@ -48,7 +49,7 @@ import org.apache.struts2.sitegraph.renderers.DOTRenderer; */ public class SiteGraph { - private static final Log LOG = LogFactory.getLog(SiteGraph.class); + private static final Logger LOG = LoggerFactory.getLogger(SiteGraph.class); private String configDir; private String views; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java index 3213a1786..5a8201eac 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java @@ -27,8 +27,6 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.config.BeanSelectionProvider; import org.apache.struts2.config.DefaultPropertiesProvider; import org.apache.struts2.config.LegacyPropertiesConfigurationProvider; @@ -42,13 +40,15 @@ import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.config.ConfigurationProvider; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Initializes and retrieves XWork config elements */ public class StrutsConfigRetriever { - private static final Log LOG = LogFactory.getLog(StrutsConfigRetriever.class); + private static final Logger LOG = LoggerFactory.getLogger(StrutsConfigRetriever.class); private static String configDir; private static String[] views; private static boolean isXWorkStarted = false; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java index c344a45eb..b4e3c0761 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java @@ -30,18 +30,18 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.StrutsConstants; import org.apache.struts2.sitegraph.model.Link; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; + /** */ public abstract class FileBasedView implements View { private String name; private String contents; - private static final Log log = LogFactory.getLog(FileBasedView.class); + private static final Logger LOG = LoggerFactory.getLogger(FileBasedView.class); public FileBasedView(File file) { this.name = file.getName(); @@ -103,9 +103,9 @@ public abstract class FileBasedView implements View { return buffer.toString(); } catch (FileNotFoundException e) { - log.warn("File not found"); + LOG.warn("File not found"); } catch (IOException e) { - log.error(e); + LOG.error("Cannot read file: "+file, e); } return null; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java index 268c98308..16194ed3e 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java @@ -28,8 +28,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.freemarker.FreemarkerManager; import com.opensymphony.module.sitemesh.Decorator; @@ -39,6 +37,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.profiling.UtilTimerStack; import freemarker.template.Configuration; @@ -106,7 +106,7 @@ import freemarker.template.Template; * @version $Date$ $Id$ */ public class FreeMarkerPageFilter extends TemplatePageFilter { - private static final Log LOG = LogFactory.getLog(FreeMarkerPageFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(FreeMarkerPageFilter.class); private static FreemarkerManager freemarkerManager; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java index b6573f732..e21583ec1 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java @@ -28,9 +28,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.freemarker.FreemarkerManager; import org.apache.struts2.views.velocity.VelocityManager; import org.apache.velocity.Template; import org.apache.velocity.context.Context; @@ -40,6 +37,8 @@ import com.opensymphony.module.sitemesh.HTMLPage; import com.opensymphony.module.sitemesh.Page; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** @@ -47,7 +46,7 @@ import com.opensymphony.xwork2.inject.Inject; * */ public class VelocityPageFilter extends TemplatePageFilter { - private static final Log LOG = LogFactory.getLog(VelocityPageFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(VelocityPageFilter.class); private static VelocityManager velocityManager; diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java index 75dcfb6e9..c30c100c8 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java @@ -22,8 +22,6 @@ package org.apache.struts2.spring; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsConstants; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.ApplicationContext; @@ -31,6 +29,8 @@ import org.springframework.web.context.support.WebApplicationContextUtils; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.spring.SpringObjectFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; @@ -42,7 +42,7 @@ import com.opensymphony.xwork2.spring.SpringObjectFactory; * */ public class StrutsSpringObjectFactory extends SpringObjectFactory { - private static final Log log = LogFactory.getLog(StrutsSpringObjectFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(StrutsSpringObjectFactory.class); @Inject public StrutsSpringObjectFactory( @@ -52,7 +52,7 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory { super(); boolean useClassCache = "true".equals(useClassCacheStr); - log.info("Initializing Struts-Spring integration..."); + LOG.info("Initializing Struts-Spring integration..."); ApplicationContext appContext = WebApplicationContextUtils.getWebApplicationContext(servletContext); if (appContext == null) { @@ -64,7 +64,7 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory { " \n" + " org.springframework.web.context.ContextLoaderListener\n" + " "; - log.fatal(message); + LOG.fatal(message); return; } @@ -84,6 +84,6 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory { this.setUseClassCache(useClassCache); - log.info("... initialized Struts-Spring integration successfully"); + LOG.info("... initialized Struts-Spring integration successfully"); } } diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java index e5df31812..523ed5e7d 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java @@ -26,11 +26,8 @@ import java.util.StringTokenizer; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.UnavailableException; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.commons.validator.ValidatorResources; import org.apache.struts.Globals; import org.apache.struts.action.ActionErrors; @@ -41,8 +38,6 @@ import org.apache.struts.config.ModuleConfig; import org.apache.struts.validator.ValidatorPlugIn; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; -import org.apache.struts2.dispatcher.Dispatcher; -import org.apache.struts2.util.ServletContextAware; import org.xml.sax.SAXException; import com.opensymphony.xwork2.ActionContext; @@ -52,6 +47,8 @@ import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import com.opensymphony.xwork2.interceptor.ScopedModelDriven; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Calls the validate() method on the ActionForm, if it exists. The errors are handled @@ -64,7 +61,7 @@ public class ActionFormValidationInterceptor extends AbstractInterceptor { private boolean stopOnFirstError; private boolean initialized = false; - private static final Log log = LogFactory.getLog(ActionFormValidationInterceptor.class); + private static final Logger LOG = LoggerFactory.getLogger(ActionFormValidationInterceptor.class); /** * Delimitter for Validator resources. @@ -163,8 +160,8 @@ public class ActionFormValidationInterceptor extends AbstractInterceptor { while (st.hasMoreTokens()) { String validatorRules = st.nextToken().trim(); - if (log.isInfoEnabled()) { - log.info("Loading validation rules file from '" + if (LOG.isInfoEnabled()) { + LOG.info("Loading validation rules file from '" + validatorRules + "'"); } @@ -197,7 +194,7 @@ public class ActionFormValidationInterceptor extends AbstractInterceptor { resources = new ValidatorResources(urlArray); } catch (SAXException sex) { - log.error("Skipping all validation", sex); + LOG.error("Skipping all validation", sex); throw new StrutsException("Skipping all validation because the validation files cannot be loaded", sex); } return resources; diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java index f8543dbf3..09eec1c46 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java @@ -20,16 +20,18 @@ */ package org.apache.struts2.tiles; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletContext; + import org.apache.tiles.TilesContainer; import org.apache.tiles.TilesException; import org.apache.tiles.factory.TilesContainerFactory; import org.apache.tiles.web.startup.TilesListener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import javax.servlet.ServletContext; -import java.util.Map; -import java.util.HashMap; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Listener used to automatically inject ServletContext @@ -44,8 +46,7 @@ import java.util.HashMap; */ public class StrutsTilesListener extends TilesListener { - private static final Log LOG = - LogFactory.getLog(StrutsTilesListener.class); + private static final Logger LOG = LoggerFactory.getLogger(StrutsTilesListener.class); private static final Map INIT; diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java index a3da57c1b..8e35118e1 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java @@ -20,20 +20,21 @@ */ package org.apache.struts2.tiles; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Container; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.views.freemarker.FreemarkerResult; import org.apache.tiles.context.TilesRequestContext; import org.apache.tiles.context.TilesRequestContextWrapper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Default implementation of TilesUtil. @@ -48,8 +49,7 @@ import java.io.IOException; */ public class StrutsTilesRequestContext extends TilesRequestContextWrapper { - private static final Log LOG = - LogFactory.getLog(StrutsTilesRequestContext.class); + private static final Logger LOG = LoggerFactory.getLogger(StrutsTilesRequestContext.class); /**