Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one

Browse Source 
- Use log4j2 Logger and LogManager instead of xwork implementation everywhere
This commit is contained in:
Johannes Geppert
2015-05-25 12:42:19 +02:00
parent 340312ed3f
commit 95805e54f7
268 changed files with 798 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/jboss-blank/src/test/java/example/HelloWorldTest.java
+1 -2
View File
@@ -21,9 +21,8 @@
package example;
import org.apache.struts2.StrutsTestCase;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.StrutsTestCase;
public class HelloWorldTest extends StrutsTestCase {
apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
+5 -11
View File
@@ -21,20 +21,14 @@
package mailreader2;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import java.io.*;
/**
* <p><code>ServletContextListener</code> that initializes and finalizes the
@@ -100,7 +94,7 @@ public final class ApplicationListener implements ServletContextListener {
/**
* <p>Logging output for this plug in instance.</p>
*/
private Logger log = LoggerFactory.getLogger(this.getClass());
private Logger log = LogManager.getLogger(this.getClass());
// ------------------------------------------------------------- Properties
apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
+4 -3
View File
@@ -20,12 +20,13 @@
*/
package mailreader2;
import com.opensymphony.xwork2.interceptor.Interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Action;
import java.util.Map;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
import org.apache.struts.apps.mailreader.dao.User;
import java.util.Map;
public class AuthenticationInterceptor implements Interceptor {
public void destroy () {}
apps/mailreader/src/main/java/mailreader2/Login.java
+1 -1
View File
@@ -21,8 +21,8 @@
package mailreader2;
import org.apache.struts.apps.mailreader.dao.User;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
import org.apache.struts.apps.mailreader.dao.User;
/**
* <p> Validate a user login. </p>
apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
+5 -6
View File
@@ -21,8 +21,9 @@
package mailreader2;
import java.util.Map;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
import org.apache.struts.apps.mailreader.dao.Subscription;
import org.apache.struts.apps.mailreader.dao.User;
@@ -32,9 +33,7 @@ import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUser;
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;
import java.util.Map;
/**
* <p> Base Action for MailreaderSupport application. </p>
@@ -388,7 +387,7 @@ public class MailreaderSupport extends ActionSupport
/**
* <p><code>Log</code> instance for this application. </p>
*/
protected Logger log = LoggerFactory.getLogger(Constants.PACKAGE);
protected Logger log = LogManager.getLogger(Constants.PACKAGE);
/**
* <p> Persist the User object, including subscriptions, to the database.
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java
+3 -3
View File
@@ -25,14 +25,14 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.dispatcher.SessionMap;
public class ChatAuthenticationInterceptor implements Interceptor {
private static final long serialVersionUID = 1L;
private static final Logger LOG = LoggerFactory.getLogger(ChatAuthenticationInterceptor.class);
private static final Logger LOG = LogManager.getLogger(ChatAuthenticationInterceptor.class);
public static final String USER_SESSION_KEY = "chatUserSessionKey";
public void destroy() {
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java
+3 -3
View File
@@ -24,8 +24,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import javax.servlet.http.HttpSession;
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpSession;
*/
public class ChatInterceptor implements Interceptor {
private static final Logger LOG = LoggerFactory.getLogger(ChatInterceptor.class);
private static final Logger LOG = LogManager.getLogger(ChatInterceptor.class);
private static final long serialVersionUID = 1L;
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java
+3 -3
View File
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.showcase.chat;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpSessionListener;
public class ChatSessionListener implements HttpSessionListener {
private static final Logger LOG = LoggerFactory.getLogger(ChatSessionListener.class);
private static final Logger LOG = LogManager.getLogger(ChatSessionListener.class);
public void sessionCreated(HttpSessionEvent event) {
}
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java
+3 -3
View File
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.showcase.chat;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.util.StrutsTypeConverter;
import java.text.ParseException;
@@ -31,7 +31,7 @@ import java.util.Map;
public class DateConverter extends StrutsTypeConverter {
private static final Logger LOG = LoggerFactory.getLogger(DateConverter.class);
private static final Logger LOG = LogManager.getLogger(DateConverter.class);
public Object convertFromString(Map context, String[] values, Class toClass) {
bundles/demo/src/main/java/actions/osgi/BundlesAction.java
+4 -8
View File
@@ -20,15 +20,11 @@
*/
package actions.osgi;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Bundle;
import org.apache.struts2.osgi.interceptor.BundleContextAware;
import org.apache.struts2.osgi.interceptor.ServiceAware;
import org.apache.struts2.convention.annotation.ResultPath;
import java.util.List;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.convention.annotation.ResultPath;
import org.apache.struts2.osgi.interceptor.BundleContextAware;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
/**
* This action shows how to interact with the OSGi container, using the OSGi interceptor
bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java
-5
View File
@@ -3,11 +3,6 @@ package actions.osgi;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.convention.annotation.Action;
import org.apache.struts2.convention.annotation.ResultPath;
import org.apache.struts2.osgi.interceptor.BundleContextAware;
import org.apache.struts2.osgi.interceptor.ServiceAware;
import org.osgi.framework.BundleContext;
import java.util.List;
@ResultPath("/content")
public class HelloWorldAction extends ActionSupport {
bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml
+1 -4
View File
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean class="actions.osgi.Message" id="message">
<constructor-arg type="java.lang.String" value="Welcome to the OSGi plugin. You can checkout any time you like, but can never leave"/>
core/pom.xml
+7 -6
View File
@@ -191,6 +191,13 @@
<optional>true</optional>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
<!-- File upload -->
<dependency>
<groupId>commons-fileupload</groupId>
@@ -258,12 +265,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
core/src/main/java/org/apache/struts2/RequestUtils.java
+3 -3
View File
@@ -21,9 +21,9 @@
package org.apache.struts2;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
@@ -37,7 +37,7 @@ import java.util.TimeZone;
*/
public class RequestUtils {
private static final Logger LOG = LoggerFactory.getLogger(RequestUtils.class);
private static final Logger LOG = LogManager.getLogger(RequestUtils.class);
private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
core/src/main/java/org/apache/struts2/ServletActionContext.java
+4 -6
View File
@@ -21,17 +21,15 @@
package org.apache.struts2;
import java.util.Map;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
import java.util.Map;
/**
core/src/main/java/org/apache/struts2/components/ActionComponent.java
+3 -3
View File
@@ -28,8 +28,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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsException;
import org.apache.struts2.StrutsStatics;
@@ -118,7 +118,7 @@ import java.util.Map;
*/
@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 Logger LOG = LoggerFactory.getLogger(ActionComponent.class);
private static final Logger LOG = LogManager.getLogger(ActionComponent.class);
protected HttpServletResponse res;
protected HttpServletRequest req;
core/src/main/java/org/apache/struts2/components/Anchor.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.components;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -61,7 +61,7 @@ import java.util.LinkedHashMap;
description = "Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets",
allowDynamicAttributes = true)
public class Anchor extends ClosingUIBean {
private static final Logger LOG = LoggerFactory.getLogger(Anchor.class);
private static final Logger LOG = LogManager.getLogger(Anchor.class);
public static final String OPEN_TEMPLATE = "a";
public static final String TEMPLATE = "a-close";
core/src/main/java/org/apache/struts2/components/AppendIterator.java
+3 -3
View File
@@ -33,8 +33,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -119,7 +119,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
@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 Logger LOG = LoggerFactory.getLogger(AppendIterator.class);
private static final Logger LOG = LogManager.getLogger(AppendIterator.class);
private AppendIteratorFilter appendIteratorFilter= null;
private List _parameters;
core/src/main/java/org/apache/struts2/components/Bean.java
+3 -3
View File
@@ -24,8 +24,8 @@ package org.apache.struts2.components;
import com.opensymphony.xwork2.ObjectFactory;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -95,7 +95,7 @@ import java.io.Writer;
@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 final Logger LOG = LoggerFactory.getLogger(Bean.class);
protected static final Logger LOG = LogManager.getLogger(Bean.class);
protected Object bean;
protected String name;
core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
@@ -34,7 +34,7 @@ import java.io.Writer;
* ClosingUIBean is the standard superclass for UI components such as div etc.
*/
public abstract class ClosingUIBean extends UIBean {
private static final Logger LOG = LoggerFactory.getLogger(ClosingUIBean.class);
private static final Logger LOG = LogManager.getLogger(ClosingUIBean.class);
protected ClosingUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
super(stack, request, response);
core/src/main/java/org/apache/struts2/components/Component.java
+3 -3
View File
@@ -25,8 +25,8 @@ import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.AnnotationUtils;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
@@ -60,7 +60,7 @@ import java.util.concurrent.ConcurrentMap;
*/
public class Component {
private static final Logger LOG = LoggerFactory.getLogger(Component.class);
private static final Logger LOG = LogManager.getLogger(Component.class);
public static final String COMPONENT_STACK = "__component_stack";
core/src/main/java/org/apache/struts2/components/Date.java
+3 -3
View File
@@ -24,8 +24,8 @@ package org.apache.struts2.components;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -143,7 +143,7 @@ import java.util.TimeZone;
@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 Logger LOG = LoggerFactory.getLogger(Date.class);
private static final Logger LOG = LogManager.getLogger(Date.class);
/**
* Property name to fall back when no format is specified
*/
core/src/main/java/org/apache/struts2/components/File.java
+3 -3
View File
@@ -28,8 +28,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -52,7 +52,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
description="Render a file input field",
allowDynamicAttributes=true)
public class File extends UIBean {
private final static Logger LOG = LoggerFactory.getLogger(File.class);
private final static Logger LOG = LogManager.getLogger(File.class);
final public static String TEMPLATE = "file";
core/src/main/java/org/apache/struts2/components/I18n.java
+3 -3
View File
@@ -37,8 +37,8 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -89,7 +89,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
" and place it on the value stack")
public class I18n extends Component {
private static final Logger LOG = LoggerFactory.getLogger(I18n.class);
private static final Logger LOG = LogManager.getLogger(I18n.class);
protected boolean pushed;
protected String name;
core/src/main/java/org/apache/struts2/components/Include.java
+3 -3
View File
@@ -49,8 +49,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -101,7 +101,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
"(result of servlet or a JSP page)")
public class Include extends Component {
private static final Logger LOG = LoggerFactory.getLogger(Include.class);
private static final Logger LOG = LogManager.getLogger(Include.class);
private static String systemEncoding = System.getProperty("file.encoding");
core/src/main/java/org/apache/struts2/components/InputTransferSelect.java
+3 -3
View File
@@ -31,8 +31,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -75,7 +75,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
@StrutsTag(name="inputtransferselect", tldTagClass="org.apache.struts2.views.jsp.ui.InputTransferSelectTag", description="Renders an input form")
public class InputTransferSelect extends ListUIBean {
private static final Logger LOG = LoggerFactory.getLogger(InputTransferSelect.class);
private static final Logger LOG = LogManager.getLogger(InputTransferSelect.class);
private static final String TEMPLATE = "inputtransferselect";
core/src/main/java/org/apache/struts2/components/IteratorComponent.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.util.MakeIterator;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -225,7 +225,7 @@ import java.util.List;
*/
@StrutsTag(name="iterator", tldTagClass="org.apache.struts2.views.jsp.IteratorTag", description="Iterate over a iterable value")
public class IteratorComponent extends ContextBean {
private static final Logger LOG = LoggerFactory.getLogger(IteratorComponent.class);
private static final Logger LOG = LogManager.getLogger(IteratorComponent.class);
protected Iterator iterator;
protected IteratorStatus status;
core/src/main/java/org/apache/struts2/components/MergeIterator.java
+3 -3
View File
@@ -33,8 +33,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -133,7 +133,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
"of a list of iterators into one iterator")
public class MergeIterator extends ContextBean implements UnnamedParametric {
private static final Logger LOG = LoggerFactory.getLogger(MergeIterator.class);
private static final Logger LOG = LogManager.getLogger(MergeIterator.class);
private MergeIteratorFilter mergeIteratorFilter = null;
private List _parameters;
core/src/main/java/org/apache/struts2/components/Number.java
+3 -3
View File
@@ -26,8 +26,8 @@ package org.apache.struts2.components;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -103,7 +103,7 @@ import java.util.Currency;
@StrutsTag(name = "number", tldBodyContent = "empty", tldTagClass = "org.apache.struts2.views.jsp.NumberTag", description = "Render a formatted number.")
public class Number extends ContextBean {
private static final Logger LOG = LoggerFactory.getLogger(Number.class);
private static final Logger LOG = LogManager.getLogger(Number.class);
/**
* Property name to fall back when no format is specified
*/
core/src/main/java/org/apache/struts2/components/OptGroup.java
+3 -3
View File
@@ -34,8 +34,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -79,7 +79,7 @@ public class OptGroup extends Component {
public static final String INTERNAL_LIST_UI_BEAN_LIST_PARAMETER_KEY = "optGroupInternalListUiBeanList";
private static Logger LOG = LoggerFactory.getLogger(OptGroup.class);
private static Logger LOG = LogManager.getLogger(OptGroup.class);
protected HttpServletRequest req;
protected HttpServletResponse res;
core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -94,7 +94,7 @@ import java.util.Map;
@StrutsTag(name="optiontransferselect", tldTagClass="org.apache.struts2.views.jsp.ui.OptionTransferSelectTag", description="Renders an input form")
public class OptionTransferSelect extends DoubleListUIBean {
private static final Logger LOG = LoggerFactory.getLogger(OptionTransferSelect.class);
private static final Logger LOG = LogManager.getLogger(OptionTransferSelect.class);
private static final String TEMPLATE = "optiontransferselect";
core/src/main/java/org/apache/struts2/components/Property.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -89,7 +89,7 @@ import java.io.Writer;
@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 Logger LOG = LoggerFactory.getLogger(Property.class);
private static final Logger LOG = LogManager.getLogger(Property.class);
public Property(ValueStack stack) {
super(stack);
core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+3 -3
View File
@@ -26,8 +26,8 @@ import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.config.entities.ActionConfig;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
@@ -47,7 +47,7 @@ public class ServletUrlRenderer implements UrlRenderer {
/**
* Provide a logging instance.
*/
private static final Logger LOG = LoggerFactory.getLogger(ServletUrlRenderer.class);
private static final Logger LOG = LogManager.getLogger(ServletUrlRenderer.class);
private ActionMapper actionMapper;
private UrlHelper urlHelper;
core/src/main/java/org/apache/struts2/components/Submit.java
+3 -3
View File
@@ -30,8 +30,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -53,7 +53,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
allowDynamicAttributes=true)
public class Submit extends FormButton {
private static final Logger LOG = LoggerFactory.getLogger(Submit.class);
private static final Logger LOG = LogManager.getLogger(Submit.class);
final public static String OPEN_TEMPLATE = "submit";
final public static String TEMPLATE = "submit-close";
protected String src;
core/src/main/java/org/apache/struts2/components/Text.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.util.TextProviderHelper;
import org.apache.struts2.views.annotations.StrutsTag;
@@ -119,7 +119,7 @@ import java.util.List;
tldTagClass="org.apache.struts2.views.jsp.TextTag",
description="Render a I18n text message")
public class Text extends ContextBean implements Param.UnnamedParametric {
private static final Logger LOG = LoggerFactory.getLogger(Text.class);
private static final Logger LOG = LogManager.getLogger(Text.class);
protected List values = Collections.EMPTY_LIST;
protected String actualName;
core/src/main/java/org/apache/struts2/components/UIBean.java
+3 -3
View File
@@ -24,8 +24,8 @@ package org.apache.struts2.components;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
import org.apache.struts2.components.template.Template;
@@ -434,7 +434,7 @@ import java.util.Map;
*
*/
public abstract class UIBean extends Component {
private static final Logger LOG = LoggerFactory.getLogger(UIBean.class);
private static final Logger LOG = LogManager.getLogger(UIBean.class);
protected HttpServletRequest request;
protected HttpServletResponse response;
core/src/main/java/org/apache/struts2/components/URL.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.components;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -110,7 +110,7 @@ import java.io.Writer;
*/
@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 Logger LOG = LoggerFactory.getLogger(URL.class);
private static final Logger LOG = LogManager.getLogger(URL.class);
private UrlProvider urlProvider;
private UrlRenderer urlRenderer;
core/src/main/java/org/apache/struts2/components/UpDownSelect.java
+3 -3
View File
@@ -31,8 +31,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: javadoc -->
@@ -82,7 +82,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
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 Logger LOG = LoggerFactory.getLogger(UpDownSelect.class);
private static final Logger LOG = LogManager.getLogger(UpDownSelect.class);
final public static String TEMPLATE = "updownselect";
core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.components.template;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import javax.servlet.ServletContext;
@@ -42,7 +42,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public abstract class BaseTemplateEngine implements TemplateEngine {
private static final Logger LOG = LoggerFactory.getLogger(BaseTemplateEngine.class);
private static final Logger LOG = LogManager.getLogger(BaseTemplateEngine.class);
/**
* The default theme properties file name. Default is 'theme.properties'
core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
+3 -3
View File
@@ -39,8 +39,8 @@ 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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import freemarker.template.Configuration;
import freemarker.template.SimpleHash;
@@ -65,7 +65,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
}
}
private static final Logger LOG = LoggerFactory.getLogger(FreemarkerTemplateEngine.class);
private static final Logger LOG = LogManager.getLogger(FreemarkerTemplateEngine.class);
@Inject
public void setFreemarkerManager(FreemarkerManager mgr) {
core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
+3 -3
View File
@@ -34,14 +34,14 @@ import org.apache.struts2.components.Include;
import org.apache.struts2.components.UIBean;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* JSP based template engine.
*/
public class JspTemplateEngine extends BaseTemplateEngine {
private static final Logger LOG = LoggerFactory.getLogger(JspTemplateEngine.class);
private static final Logger LOG = LogManager.getLogger(JspTemplateEngine.class);
String encoding;
core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
+3 -3
View File
@@ -36,14 +36,14 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* Velocity based template engine.
*/
public class VelocityTemplateEngine extends BaseTemplateEngine {
private static final Logger LOG = LoggerFactory.getLogger(VelocityTemplateEngine.class);
private static final Logger LOG = LogManager.getLogger(VelocityTemplateEngine.class);
private VelocityManager velocityManager;
core/src/main/java/org/apache/struts2/config/AbstractBeanSelectionProvider.java
+3 -3
View File
@@ -11,8 +11,8 @@ import com.opensymphony.xwork2.inject.Factory;
import com.opensymphony.xwork2.inject.Scope;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.util.Properties;
@@ -21,7 +21,7 @@ import java.util.Properties;
*/
public abstract class AbstractBeanSelectionProvider implements BeanSelectionProvider {
private static final Logger LOG = LoggerFactory.getLogger(AbstractBeanSelectionProvider.class);
private static final Logger LOG = LogManager.getLogger(AbstractBeanSelectionProvider.class);
public static final String DEFAULT_BEAN_NAME = "struts";
core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+3 -3
View File
@@ -56,8 +56,8 @@ import com.opensymphony.xwork2.util.PatternMatcher;
import com.opensymphony.xwork2.util.TextParser;
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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
import com.opensymphony.xwork2.validator.ActionValidatorManager;
@@ -357,7 +357,7 @@ import java.util.StringTokenizer;
*/
public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider {
private static final Logger LOG = LoggerFactory.getLogger(DefaultBeanSelectionProvider.class);
private static final Logger LOG = LogManager.getLogger(DefaultBeanSelectionProvider.class);
public void register(ContainerBuilder builder, LocatableProperties props) {
alias(ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY, builder, props);
core/src/main/java/org/apache/struts2/config/DefaultSettings.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.config;
import com.opensymphony.xwork2.util.location.Location;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import java.util.ArrayList;
@@ -38,7 +38,7 @@ import java.util.StringTokenizer;
*/
public class DefaultSettings implements Settings {
private static final Logger LOG = LoggerFactory.getLogger(DefaultSettings.class);
private static final Logger LOG = LogManager.getLogger(DefaultSettings.class);
/**
* The Settings object that handles API calls.
core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
+3 -3
View File
@@ -25,8 +25,8 @@ import com.opensymphony.xwork2.util.ClassLoaderUtil;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsException;
import java.io.IOException;
@@ -40,7 +40,7 @@ import java.util.Iterator;
*/
class PropertiesSettings implements Settings {
private static final Logger LOG = LoggerFactory.getLogger(PropertiesSettings.class);
private static final Logger LOG = LogManager.getLogger(PropertiesSettings.class);
private LocatableProperties settings;
core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
+3 -3
View File
@@ -40,15 +40,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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* Override Xwork class so we can use an arbitrary config file
*/
public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider {
private static final Logger LOG = LoggerFactory.getLogger(StrutsXmlConfigurationProvider.class);
private static final Logger LOG = LogManager.getLogger(StrutsXmlConfigurationProvider.class);
private File baseDir = null;
private String filename;
private String reloadKey;
core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
import javax.servlet.Filter;
@@ -70,7 +70,7 @@ import java.io.IOException;
*/
public class ActionContextCleanUp implements Filter {
private static final Logger LOG = LoggerFactory.getLogger(ActionContextCleanUp.class);
private static final Logger LOG = LogManager.getLogger(ActionContextCleanUp.class);
private static final String COUNTER = "__cleanup_recursion_counter";
core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java
+3 -3
View File
@@ -3,8 +3,8 @@ package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.inject.Inject;
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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import freemarker.template.Template;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
@@ -26,7 +26,7 @@ import java.util.List;
*/
public class DefaultDispatcherErrorHandler implements DispatcherErrorHandler {
private static final Logger LOG = LoggerFactory.getLogger(DefaultDispatcherErrorHandler.class);
private static final Logger LOG = LogManager.getLogger(DefaultDispatcherErrorHandler.class);
private FreemarkerManager freemarkerManager;
private boolean devMode;
core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
+3 -3
View File
@@ -22,8 +22,8 @@ package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.ng.HostConfig;
@@ -66,7 +66,7 @@ public class DefaultStaticContentLoader implements StaticContentLoader {
/**
* Provide a logging instance.
*/
private Logger LOG = LoggerFactory.getLogger(DefaultStaticContentLoader.class);
private Logger LOG = LogManager.getLogger(DefaultStaticContentLoader.class);
/**
* Store set of path prefixes to use with static resources.
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+3 -3
View File
@@ -38,8 +38,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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
@@ -77,7 +77,7 @@ public class Dispatcher {
/**
* Provide a logging instance.
*/
private static final Logger LOG = LoggerFactory.getLogger(Dispatcher.class);
private static final Logger LOG = LogManager.getLogger(Dispatcher.class);
/**
* Provide a thread local instance.
core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+4 -2
View File
@@ -28,8 +28,9 @@ 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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsStatics;
@@ -199,6 +200,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
}
}
@Deprecated
private void initLogging() {
String factoryName = filterConfig.getInitParameter("loggerFactory");
if (factoryName != null) {
@@ -218,7 +220,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
}
}
log = LoggerFactory.getLogger(FilterDispatcher.class);
log = LogManager.getLogger(FilterDispatcher.class);
}
core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
+3 -3
View File
@@ -29,8 +29,8 @@ import javax.servlet.http.HttpSession;
import org.apache.struts2.config.ServletContextSingleton;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
@@ -52,7 +52,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
*/
public class FilterDispatcherCompatWeblogic61 extends FilterDispatcher {
private static Logger LOG = LoggerFactory.getLogger(FilterDispatcherCompatWeblogic61.class);
private static Logger LOG = LogManager.getLogger(FilterDispatcherCompatWeblogic61.class);
/**
* dummy setter for {@link #filterConfig}; this method
core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
+3 -3
View File
@@ -26,8 +26,8 @@ import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import javax.servlet.http.HttpServletResponse;
@@ -80,7 +80,7 @@ import java.util.Map;
public class HttpHeaderResult implements Result {
private static final long serialVersionUID = 195648957144219214L;
private static final Logger LOG = LoggerFactory.getLogger(HttpHeaderResult.class);
private static final Logger LOG = LogManager.getLogger(HttpHeaderResult.class);
/**
* This result type doesn't have a default param, null is ok to reduce noice in logs
core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
@@ -77,7 +77,7 @@ public class PlainTextResult extends StrutsResultSupport {
public static final int BUFFER_SIZE = 1024;
private static final Logger LOG = LoggerFactory.getLogger(PlainTextResult.class);
private static final Logger LOG = LogManager.getLogger(PlainTextResult.class);
private static final long serialVersionUID = 3633371605905583950L;
core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.dispatcher;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.struts2.ServletActionContext;
@@ -95,7 +95,7 @@ public class ServletDispatcherResult extends StrutsResultSupport {
private static final long serialVersionUID = -1970659272360685627L;
private static final Logger LOG = LoggerFactory.getLogger(ServletDispatcherResult.class);
private static final Logger LOG = LogManager.getLogger(ServletDispatcherResult.class);
private UrlHelper urlHelper;
core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+3 -3
View File
@@ -25,8 +25,8 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.reflection.ReflectionException;
import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler;
import org.apache.struts2.ServletActionContext;
@@ -100,7 +100,7 @@ public class ServletRedirectResult extends StrutsResultSupport implements Reflec
private static final long serialVersionUID = 6316947346435301270L;
private static final Logger LOG = LoggerFactory.getLogger(ServletRedirectResult.class);
private static final Logger LOG = LogManager.getLogger(ServletRedirectResult.class);
protected boolean prependServletContext = true;
protected ActionMapper actionMapper;
core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
+3 -3
View File
@@ -27,8 +27,8 @@ import java.io.OutputStream;
import javax.servlet.http.HttpServletResponse;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -91,7 +91,7 @@ public class StreamResult extends StrutsResultSupport {
private static final long serialVersionUID = -1468409635999059850L;
protected static final Logger LOG = LoggerFactory.getLogger(StreamResult.class);
protected static final Logger LOG = LogManager.getLogger(StreamResult.class);
public static final String DEFAULT_PARAM = "inputName";
core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
+3 -3
View File
@@ -31,8 +31,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
@@ -105,7 +105,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
*/
public abstract class StrutsResultSupport implements Result, StrutsStatics {
private static final Logger LOG = LoggerFactory.getLogger(StrutsResultSupport.class);
private static final Logger LOG = LogManager.getLogger(StrutsResultSupport.class);
/** The default parameter */
public static final String DEFAULT_PARAM = "location";
core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
+3 -3
View File
@@ -25,8 +25,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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.JspSupportServlet;
@@ -85,7 +85,7 @@ public class VelocityResult extends StrutsResultSupport {
private static final long serialVersionUID = 7268830767762559424L;
private static final Logger LOG = LoggerFactory.getLogger(VelocityResult.class);
private static final Logger LOG = LogManager.getLogger(VelocityResult.class);
private String defaultEncoding;
private VelocityManager velocityManager;
core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
+3 -3
View File
@@ -24,8 +24,8 @@ package org.apache.struts2.dispatcher.mapper;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
@@ -47,7 +47,7 @@ import java.util.List;
*/
public class CompositeActionMapper implements ActionMapper {
private static final Logger LOG = LoggerFactory.getLogger(CompositeActionMapper.class);
private static final Logger LOG = LogManager.getLogger(CompositeActionMapper.class);
protected List<ActionMapper> actionMappers = new LinkedList<ActionMapper>();
core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+3 -3
View File
@@ -27,8 +27,8 @@ import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.ServletActionContext;
@@ -110,7 +110,7 @@ import java.util.regex.Pattern;
*/
public class DefaultActionMapper implements ActionMapper {
private static final Logger LOG = LoggerFactory.getLogger(DefaultActionMapper.class);
private static final Logger LOG = LogManager.getLogger(DefaultActionMapper.class);
protected static final String METHOD_PREFIX = "method:";
protected static final String ACTION_PREFIX = "action:";
core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java
+3 -3
View File
@@ -3,8 +3,8 @@ package org.apache.struts2.dispatcher.mapper;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsConstants;
@@ -41,7 +41,7 @@ import java.util.Map;
*/
public class PrefixBasedActionMapper extends DefaultActionMapper implements ActionMapper {
private static final Logger LOG = LoggerFactory.getLogger(PrefixBasedActionMapper.class);
private static final Logger LOG = LogManager.getLogger(PrefixBasedActionMapper.class);
protected Container container;
protected Map<String, ActionMapper> actionMappers = new HashMap<String, ActionMapper>();
core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.dispatcher.mapper;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
@@ -38,7 +38,7 @@ import java.util.StringTokenizer;
*/
public class Restful2ActionMapper extends DefaultActionMapper {
protected static final Logger LOG = LoggerFactory.getLogger(Restful2ActionMapper.class);
protected static final Logger LOG = LogManager.getLogger(Restful2ActionMapper.class);
public static final String HTTP_METHOD_PARAM = "__http_method";
private String idParameterName = null;
core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.dispatcher.mapper;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.RequestUtils;
import javax.servlet.http.HttpServletRequest;
@@ -38,7 +38,7 @@ import java.util.StringTokenizer;
* http://struts.apache.org/2.x/docs/restfulactionmapper.html
*/
public class RestfulActionMapper implements ActionMapper {
protected static final Logger LOG = LoggerFactory.getLogger(RestfulActionMapper.class);
protected static final Logger LOG = LogManager.getLogger(RestfulActionMapper.class);
/* (non-Javadoc)
* @see org.apache.struts2.dispatcher.mapper.ActionMapper#getMapping(javax.servlet.http.HttpServletRequest)
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+3 -3
View File
@@ -24,8 +24,8 @@ package org.apache.struts2.dispatcher.multipart;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadBase;
import org.apache.commons.fileupload.FileUploadException;
@@ -54,7 +54,7 @@ import java.util.Set;
*/
public class JakartaMultiPartRequest implements MultiPartRequest {
static final Logger LOG = LoggerFactory.getLogger(JakartaMultiPartRequest.class);
static final Logger LOG = LogManager.getLogger(JakartaMultiPartRequest.class);
// maps parameter name -> List of FileItem objects
protected Map<String, List<FileItem>> files = new HashMap<String, List<FileItem>>();
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+3 -3
View File
@@ -3,8 +3,8 @@ package org.apache.struts2.dispatcher.multipart;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.fileupload.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.FileUploadBase;
@@ -40,7 +40,7 @@ import java.util.Map;
*/
public class JakartaStreamMultiPartRequest implements MultiPartRequest {
static final Logger LOG = LoggerFactory.getLogger(JakartaStreamMultiPartRequest.class);
static final Logger LOG = LogManager.getLogger(JakartaStreamMultiPartRequest.class);
/**
* Defines the internal buffer size used during streaming operations.
core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
+3 -3
View File
@@ -24,8 +24,8 @@ package org.apache.struts2.dispatcher.multipart;
import com.opensymphony.xwork2.DefaultLocaleProvider;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.dispatcher.StrutsRequestWrapper;
import javax.servlet.http.HttpServletRequest;
@@ -58,7 +58,7 @@ import java.util.Vector;
*/
public class MultiPartRequestWrapper extends StrutsRequestWrapper {
protected static final Logger LOG = LoggerFactory.getLogger(MultiPartRequestWrapper.class);
protected static final Logger LOG = LogManager.getLogger(MultiPartRequestWrapper.class);
private Collection<String> errors;
private MultiPartRequest multi;
core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
+2
View File
@@ -23,6 +23,7 @@ package org.apache.struts2.dispatcher.ng;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.StaticContentLoader;
@@ -46,6 +47,7 @@ public class InitOperations {
/**
* Initializes the internal Struts logging
*/
@Deprecated
public void initLogging( HostConfig filterConfig ) {
String factoryName = filterConfig.getInitParameter("loggerFactory");
if (factoryName != null) {
core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
+4 -4
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.dispatcher.ng;
import com.opensymphony.xwork2.ActionContext;
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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.Dispatcher;
@@ -45,12 +45,12 @@ import java.util.regex.Pattern;
*/
public class PrepareOperations {
private static final Logger LOG = LoggerFactory.getLogger(PrepareOperations.class);
private static final Logger LOG = LogManager.getLogger(PrepareOperations.class);
private Dispatcher dispatcher;
private static final String STRUTS_ACTION_MAPPING_KEY = "struts.actionMapping";
public static final String CLEANUP_RECURSION_COUNTER = "__cleanup_recursion_counter";
private Logger log = LoggerFactory.getLogger(PrepareOperations.class);
private Logger log = LogManager.getLogger(PrepareOperations.class);
@Deprecated
public PrepareOperations(ServletContext servletContext, Dispatcher dispatcher) {
core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
+3 -3
View File
@@ -5,8 +5,8 @@ import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import java.util.HashMap;
@@ -33,7 +33,7 @@ import java.util.Map;
*/
public class PrefixBasedActionProxyFactory extends DefaultActionProxyFactory {
private static final Logger LOG = LoggerFactory.getLogger(PrefixBasedActionProxyFactory.class);
private static final Logger LOG = LogManager.getLogger(PrefixBasedActionProxyFactory.class);
private Map<String, ActionProxyFactory> actionProxyFactories = new HashMap<String, ActionProxyFactory>();
private ActionProxyFactory defaultFactory;
core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import java.util.Map;
@@ -55,7 +55,7 @@ public class CheckboxInterceptor extends AbstractInterceptor {
private String uncheckedValue = Boolean.FALSE.toString();
private static final Logger LOG = LoggerFactory.getLogger(CheckboxInterceptor.class);
private static final Logger LOG = LogManager.getLogger(CheckboxInterceptor.class);
public String intercept(ActionInvocation ai) throws Exception {
Map<String, Object> parameters = ai.getInvocationContext().getParameters();
core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java
+3 -3
View File
@@ -26,8 +26,8 @@ import java.util.Map;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: description -->
@@ -77,7 +77,7 @@ public class ClearSessionInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = -2102199238428329238L;
private static final Logger LOG = LoggerFactory.getLogger(ClearSessionInterceptor.class);
private static final Logger LOG = LogManager.getLogger(ClearSessionInterceptor.class);
/* (non-Javadoc)
* @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation)
core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+3 -3
View File
@@ -29,8 +29,8 @@ import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import javax.servlet.http.Cookie;
@@ -167,7 +167,7 @@ public class CookieInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = 4153142432948747305L;
private static final Logger LOG = LoggerFactory.getLogger(CookieInterceptor.class);
private static final Logger LOG = LogManager.getLogger(CookieInterceptor.class);
private static final String ACCEPTED_PATTERN = "[a-zA-Z0-9\\.\\]\\[_'\\s]+";
core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java
+3 -3
View File
@@ -25,8 +25,8 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.interceptor.PreResultListener;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsStatics;
import javax.servlet.http.Cookie;
@@ -68,7 +68,7 @@ import java.util.Set;
*/
public class CookieProviderInterceptor extends AbstractInterceptor implements PreResultListener {
private static final Logger LOG = LoggerFactory.getLogger(CookieProviderInterceptor.class);
private static final Logger LOG = LogManager.getLogger(CookieProviderInterceptor.class);
public String intercept(ActionInvocation invocation) throws Exception {
invocation.addPreResultListener(this);
core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.interceptor;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.SessionMap;
@@ -83,7 +83,7 @@ public class CreateSessionInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = -4590322556118858869L;
private static final Logger LOG = LoggerFactory.getLogger(CreateSessionInterceptor.class);
private static final Logger LOG = LogManager.getLogger(CreateSessionInterceptor.class);
/* (non-Javadoc)
core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java
+3 -3
View File
@@ -11,12 +11,12 @@ import java.util.Map.Entry;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
public class DateTextFieldInterceptor implements Interceptor {
private static final Logger LOG = LoggerFactory.getLogger(DateTextFieldInterceptor.class);
private static final Logger LOG = LogManager.getLogger(DateTextFieldInterceptor.class);
public static enum DateWord {
core/src/main/java/org/apache/struts2/interceptor/DeprecationInterceptor.java
+3 -3
View File
@@ -5,8 +5,8 @@ import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.StrutsConstants;
import java.lang.reflect.Field;
@@ -25,7 +25,7 @@ import java.util.Set;
*/
public class DeprecationInterceptor extends AbstractInterceptor {
private static final Logger LOG = LoggerFactory.getLogger(DeprecationInterceptor.class);
private static final Logger LOG = LogManager.getLogger(DeprecationInterceptor.class);
private Container container;
private boolean devMode;
core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
+3 -3
View File
@@ -32,8 +32,8 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.util.TokenHelper;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.Dispatcher;
@@ -175,7 +175,7 @@ public class ExecuteAndWaitInterceptor extends MethodFilterInterceptor {
private static final long serialVersionUID = -2754639196749652512L;
private static final Logger LOG = LoggerFactory.getLogger(ExecuteAndWaitInterceptor.class);
private static final Logger LOG = LogManager.getLogger(ExecuteAndWaitInterceptor.class);
public static final String KEY = "__execWait";
public static final String WAIT = "wait";
core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+3 -3
View File
@@ -32,8 +32,8 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
import org.apache.struts2.util.ContentTypeMatcher;
@@ -189,7 +189,7 @@ public class FileUploadInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = -4764627478894962478L;
protected static final Logger LOG = LoggerFactory.getLogger(FileUploadInterceptor.class);
protected static final Logger LOG = LogManager.getLogger(FileUploadInterceptor.class);
protected Long maximumSize;
protected Set<String> allowedTypesSet = Collections.emptySet();
core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
+3 -3
View File
@@ -32,8 +32,8 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: description -->
@@ -152,7 +152,7 @@ public class MessageStoreInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = 9161650888603380164L;
private static final Logger LOG = LoggerFactory.getLogger(MessageStoreInterceptor.class);
private static final Logger LOG = LogManager.getLogger(MessageStoreInterceptor.class);
public static final String AUTOMATIC_MODE = "AUTOMATIC";
public static final String STORE_MODE = "STORE";
core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.interceptor;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.ServletActionContext;
import javax.servlet.http.HttpServletRequest;
@@ -88,7 +88,7 @@ import java.util.List;
*/
public class RolesInterceptor extends AbstractInterceptor {
private static final Logger LOG = LoggerFactory.getLogger(RolesInterceptor.class);
private static final Logger LOG = LogManager.getLogger(RolesInterceptor.class);
private boolean isProperlyConfigured = true;
core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
+3 -3
View File
@@ -35,8 +35,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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
* <!-- START SNIPPET: description -->
@@ -144,7 +144,7 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi
private static final long serialVersionUID = 9120762699600054395L;
private static final Logger LOG = LoggerFactory.getLogger(ScopeInterceptor.class);
private static final Logger LOG = LogManager.getLogger(ScopeInterceptor.class);
private String[] application = null;
private String[] session = null;
core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
+3 -3
View File
@@ -50,8 +50,8 @@ import com.opensymphony.xwork2.inject.Inject;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
/**
@@ -93,7 +93,7 @@ public class DebuggingInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = -3097324155953078783L;
private final static Logger LOG = LoggerFactory.getLogger(DebuggingInterceptor.class);
private final static Logger LOG = LogManager.getLogger(DebuggingInterceptor.class);
private String[] ignorePrefixes = new String[]{"org.apache.struts.",
"com.opensymphony.xwork2.", "xwork."};
core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
+3 -3
View File
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.StringTokenizer;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
@@ -38,7 +38,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
*/
public class IteratorGenerator implements Iterator, Action {
private static final Logger LOG = LoggerFactory.getLogger(IteratorGenerator.class);
private static final Logger LOG = LogManager.getLogger(IteratorGenerator.class);
List values;
Object value;
core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
+3 -3
View File
@@ -28,7 +28,7 @@ import java.util.Iterator;
import java.util.List;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.LogManager;
/**
@@ -67,7 +67,7 @@ public class SortIteratorFilter extends IteratorFilterSupport implements Iterato
} else {
try {
if (!MakeIterator.isIterable(source)) {
LoggerFactory.getLogger(SortIteratorFilter.class.getName()).warn("Cannot create SortIterator for source " + source);
LogManager.getLogger(SortIteratorFilter.class.getName()).warn("Cannot create SortIterator for source " + source);
return ERROR;
}
@@ -86,7 +86,7 @@ public class SortIteratorFilter extends IteratorFilterSupport implements Iterato
return SUCCESS;
} catch (Exception e) {
LoggerFactory.getLogger(SortIteratorFilter.class.getName()).warn("Error creating sort iterator.", e);
LogManager.getLogger(SortIteratorFilter.class.getName()).warn("Error creating sort iterator.", e);
return ERROR;
}
core/src/main/java/org/apache/struts2/util/StrutsUtil.java
+3 -3
View File
@@ -27,8 +27,8 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.views.jsp.ui.OgnlTool;
import org.apache.struts2.views.util.UrlHelper;
@@ -54,7 +54,7 @@ import java.util.Map;
*/
public class StrutsUtil {
protected static final Logger LOG = LoggerFactory.getLogger(StrutsUtil.class);
protected static final Logger LOG = LogManager.getLogger(StrutsUtil.class);
protected HttpServletRequest request;
protected HttpServletResponse response;
core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java
+4 -4
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.util;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.util.ArrayList;
import java.util.Iterator;
@@ -36,7 +36,7 @@ import java.util.List;
*/
public class SubsetIteratorFilter extends IteratorFilterSupport implements Iterator, Action {
private static final Logger LOG = LoggerFactory.getLogger(SubsetIteratorFilter.class);
private static final Logger LOG = LogManager.getLogger(SubsetIteratorFilter.class);
Iterator iterator;
Object source;
@@ -69,7 +69,7 @@ public class SubsetIteratorFilter extends IteratorFilterSupport implements Itera
// Action implementation -----------------------------------------
public String execute() {
if (source == null) {
LoggerFactory.getLogger(SubsetIteratorFilter.class.getName()).warn("Source is null returning empty set.");
LogManager.getLogger(SubsetIteratorFilter.class.getName()).warn("Source is null returning empty set.");
return ERROR;
}
core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.util;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.util.Collections;
import java.util.List;
@@ -34,7 +34,7 @@ import java.util.List;
*/
public class TextProviderHelper {
private static final Logger LOG = LoggerFactory.getLogger(TextProviderHelper.class);
private static final Logger LOG = LogManager.getLogger(TextProviderHelper.class);
/**
* <p>Get a message from the first TextProvider encountered in the stack.
core/src/main/java/org/apache/struts2/util/TokenHelper.java
+3 -3
View File
@@ -23,8 +23,8 @@ package org.apache.struts2.util;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.math.BigInteger;
import java.security.SecureRandom;
@@ -51,7 +51,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 Logger LOG = LoggerFactory.getLogger(TokenHelper.class);
private static final Logger LOG = LogManager.getLogger(TokenHelper.class);
private static final Random RANDOM = new SecureRandom();
core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java
+3 -3
View File
@@ -4,8 +4,8 @@ import com.opensymphony.xwork2.util.fs.DefaultFileManager;
import com.opensymphony.xwork2.util.fs.FileRevision;
import com.opensymphony.xwork2.util.fs.JarEntryRevision;
import com.opensymphony.xwork2.util.fs.Revision;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.io.File;
import java.io.IOException;
@@ -22,7 +22,7 @@ import java.util.List;
*/
public class JBossFileManager extends DefaultFileManager {
private static final Logger LOG = LoggerFactory.getLogger(JBossFileManager.class);
private static final Logger LOG = LogManager.getLogger(JBossFileManager.class);
private static final String JBOSS5_VFS = "vfs";
private static final String JBOSS5_VFSZIP = "vfszip";
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+3 -3
View File
@@ -27,8 +27,8 @@ import com.opensymphony.xwork2.inject.Container;
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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import freemarker.cache.ClassTemplateLoader;
import freemarker.cache.FileTemplateLoader;
import freemarker.cache.MultiTemplateLoader;
@@ -158,7 +158,7 @@ public class FreemarkerManager {
// end freemarker definitions...
private static final Logger LOG = LoggerFactory.getLogger(FreemarkerManager.class);
private static final Logger LOG = LogManager.getLogger(FreemarkerManager.class);
public static final String CONFIG_SERVLET_CONTEXT_KEY = "freemarker.Configuration";
public static final String KEY_EXCEPTION = "exception";
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+3 -3
View File
@@ -26,8 +26,8 @@ import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.LocaleProvider;
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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import freemarker.template.Configuration;
import freemarker.template.ObjectWrapper;
import freemarker.template.Template;
@@ -104,7 +104,7 @@ public class FreemarkerResult extends StrutsResultSupport {
private static final long serialVersionUID = -3778230771704661631L;
private static final Logger LOG = LoggerFactory.getLogger(FreemarkerResult.class);
private static final Logger LOG = LogManager.getLogger(FreemarkerResult.class);
protected ActionInvocation invocation;
protected Configuration configuration;
core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
+3 -3
View File
@@ -24,8 +24,8 @@ package org.apache.struts2.views.freemarker.tags;
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 org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import freemarker.ext.beans.BeansWrapper;
import freemarker.template.SimpleNumber;
import freemarker.template.SimpleSequence;
@@ -43,7 +43,7 @@ import java.util.Iterator;
import java.util.Map;
public abstract class TagModel implements TemplateTransformModel {
private static final Logger LOG = LoggerFactory.getLogger(TagModel.class);
private static final Logger LOG = LogManager.getLogger(TagModel.class);
protected ValueStack stack;
protected HttpServletRequest req;
core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
+3 -3
View File
@@ -28,8 +28,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
@@ -39,7 +39,7 @@ public class BeanTag extends ContextBeanTag {
private static final long serialVersionUID = -3863152522071209267L;
protected static Logger LOG = LoggerFactory.getLogger(BeanTag.class);
protected static Logger LOG = LogManager.getLogger(BeanTag.class);
protected String name;
core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
+3 -3
View File
@@ -29,8 +29,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
@@ -134,7 +134,7 @@ public class IteratorGeneratorTag extends StrutsBodyTagSupport {
public static final String DEFAULT_SEPARATOR = ",";
private static final Logger LOG = LoggerFactory.getLogger(IteratorGeneratorTag.class);
private static final Logger LOG = LogManager.getLogger(IteratorGeneratorTag.class);
String countAttr;
String separatorAttr;
core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
+3 -3
View File
@@ -29,8 +29,8 @@ 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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
/**
@@ -155,7 +155,7 @@ public class SubsetIteratorTag extends StrutsBodyTagSupport {
private static final long serialVersionUID = -6252696081713080102L;
private static final Logger LOG = LoggerFactory.getLogger(SubsetIteratorTag.class);
private static final Logger LOG = LogManager.getLogger(SubsetIteratorTag.class);
String countAttr;
String sourceAttr;
core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
+3 -3
View File
@@ -21,8 +21,8 @@
package org.apache.struts2.views.jsp.ui;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;
@@ -37,7 +37,7 @@ import java.util.List;
*/
public class AbstractUITagBeanInfo extends SimpleBeanInfo {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUITagBeanInfo.class);
private static final Logger LOG = LogManager.getLogger(AbstractUITagBeanInfo.class);
@Override
public PropertyDescriptor[] getPropertyDescriptors() {
core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
+3 -3
View File
@@ -22,8 +22,8 @@
package org.apache.struts2.views.util;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.StrutsConstants;
@@ -45,7 +45,7 @@ import java.util.Map;
*/
public class DefaultUrlHelper implements UrlHelper {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUrlHelper.class);
private static final Logger LOG = LogManager.getLogger(DefaultUrlHelper.class);
public static final String HTTP_PROTOCOL = "http";
public static final String HTTPS_PROTOCOL = "https";
core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+3 -3
View File
@@ -25,8 +25,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;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
@@ -66,7 +66,7 @@ import java.util.StringTokenizer;
*
*/
public class VelocityManager {
private static final Logger LOG = LoggerFactory.getLogger(VelocityManager.class);
private static final Logger LOG = LogManager.getLogger(VelocityManager.class);
public static final String STRUTS = "struts";
private ObjectFactory objectFactory;

Some files were not shown because too many files have changed in this diff Show More