http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java index 11d3f31..7d38122 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java @@ -26,8 +26,8 @@ import ognl.OgnlContext; import ognl.OgnlRuntime; import ognl.PropertyAccessor; -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.ReflectionContextState; @@ -40,7 +40,7 @@ import com.opensymphony.xwork2.util.reflection.ReflectionContextState; */ public class XWorkMethodAccessor extends ObjectMethodAccessor { - private static final Logger LOG = LoggerFactory.getLogger(XWorkMethodAccessor.class); + private static final Logger LOG = LogManager.getLogger(XWorkMethodAccessor.class); /** * @deprecated Use {@link ReflectionContextState#DENY_METHOD_EXECUTION} instead
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java index 4992281..20eeff8 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java @@ -3,8 +3,8 @@ package com.opensymphony.xwork2.security; import com.opensymphony.xwork2.XWorkConstants; import com.opensymphony.xwork2.inject.Inject; 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 java.util.Arrays; import java.util.HashSet; @@ -13,7 +13,7 @@ import java.util.regex.Pattern; public class DefaultAcceptedPatternsChecker implements AcceptedPatternsChecker { - private static final Logger LOG = LoggerFactory.getLogger(DefaultAcceptedPatternsChecker.class); + private static final Logger LOG = LogManager.getLogger(DefaultAcceptedPatternsChecker.class); public static final String[] ACCEPTED_PATTERNS = { "\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*" http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java index d96b67a..8ac60eb 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java @@ -3,8 +3,8 @@ package com.opensymphony.xwork2.security; import com.opensymphony.xwork2.*; import com.opensymphony.xwork2.inject.Inject; 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 java.util.Arrays; import java.util.HashSet; @@ -13,7 +13,7 @@ import java.util.regex.Pattern; public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker { - private static final Logger LOG = LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class); + private static final Logger LOG = LogManager.getLogger(DefaultExcludedPatternsChecker.class); public static final String[] EXCLUDED_PATTERNS = { "(^|.*#)(dojo|struts|session|request|application|servlet(Request|Response)|parameters|context|_memberAccess)(\\.|\\[).*", http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java index 56f6b53..2cfb091 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java @@ -17,8 +17,8 @@ package com.opensymphony.xwork2.spring; import com.opensymphony.xwork2.ObjectFactory; 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.springframework.beans.BeansException; import org.springframework.beans.factory.UnsatisfiedDependencyException; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; @@ -39,7 +39,7 @@ import java.util.Map; * @author Simon Stewart (s...@lateral.net) */ public class SpringObjectFactory extends ObjectFactory implements ApplicationContextAware { - private static final Logger LOG = LoggerFactory.getLogger(SpringObjectFactory.class); + private static final Logger LOG = LogManager.getLogger(SpringObjectFactory.class); protected ApplicationContext appContext; protected AutowireCapableBeanFactory autoWiringFactory; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java index 8d5a524..616ac0f 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java @@ -15,8 +15,8 @@ */ package com.opensymphony.xwork2.spring; -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.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; @@ -33,7 +33,7 @@ import java.util.Map; */ public class SpringProxyableObjectFactory extends SpringObjectFactory { - private static final Logger LOG = LoggerFactory.getLogger(SpringProxyableObjectFactory.class); + private static final Logger LOG = LogManager.getLogger(SpringProxyableObjectFactory.class); private List<String> skipBeanNames = new ArrayList<String>(); http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java index 473e0dc..611a1a3 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java @@ -20,8 +20,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import com.opensymphony.xwork2.spring.SpringObjectFactory; -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.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -60,7 +60,7 @@ import org.springframework.web.context.WebApplicationContext; * @author Eric Hauser */ public class ActionAutowiringInterceptor extends AbstractInterceptor implements ApplicationContextAware { - private static final Logger LOG = LoggerFactory.getLogger(ActionAutowiringInterceptor.class); + private static final Logger LOG = LogManager.getLogger(ActionAutowiringInterceptor.class); public static final String APPLICATION_CONTEXT = "com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor.applicationContext"; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java index 71ecc82..6e77ecf 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java @@ -19,8 +19,8 @@ import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.XWorkException; import com.opensymphony.xwork2.util.location.Location; import com.opensymphony.xwork2.util.location.LocationAttributes; -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.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -43,7 +43,7 @@ import java.util.Map; */ public class DomHelper { - private static final Logger LOG = LoggerFactory.getLogger(DomHelper.class); + private static final Logger LOG = LogManager.getLogger(DomHelper.class); public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/";; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java index 1e51ded..943a956 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java @@ -25,8 +25,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -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.ReflectionProviderFactory; import org.apache.commons.lang3.ObjectUtils; @@ -86,7 +86,7 @@ import java.util.concurrent.ConcurrentMap; */ public class LocalizedTextUtil { - private static final Logger LOG = LoggerFactory.getLogger(LocalizedTextUtil.class); + private static final Logger LOG = LogManager.getLogger(LocalizedTextUtil.class); private static final String TOMCAT_RESOURCE_ENTRIES_FIELD = "resourceEntries"; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java index 59d1f3c..e7222cd 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java @@ -14,8 +14,8 @@ */ package com.opensymphony.xwork2.util; -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.FileInputStream; @@ -66,7 +66,7 @@ import java.util.jar.JarInputStream; */ public class ResolverUtil<T> { /** An instance of Log to use for logging in this class. */ - private static final Logger LOG = LoggerFactory.getLogger(ResolverUtil.class); + private static final Logger LOG = LogManager.getLogger(ResolverUtil.class); /** * A simple interface that specifies how to test classes to determine if they http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java index 160a5b9..db436f1 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java @@ -15,8 +15,8 @@ */ package com.opensymphony.xwork2.util; -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.net.MalformedURLException; import java.net.URL; @@ -26,7 +26,7 @@ import java.net.URL; */ public class URLUtil { - private static final Logger LOG = LoggerFactory.getLogger(URLUtil.class); + private static final Logger LOG = LogManager.getLogger(URLUtil.class); /** * Verify That the given String is in valid URL format. http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java index 6feee75..d627473 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java @@ -20,8 +20,8 @@ import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.XWorkException; import com.opensymphony.xwork2.conversion.TypeConverter; import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -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.Collection; @@ -38,7 +38,7 @@ import java.util.Map; * @author Patrick Lightbody */ public class XWorkList extends ArrayList { - private static final Logger LOG = LoggerFactory.getLogger(XWorkConverter.class); + private static final Logger LOG = LogManager.getLogger(XWorkConverter.class); private Class clazz; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java index 4475449..bab9368 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java @@ -15,8 +15,8 @@ */ package com.opensymphony.xwork2.util.classloader; -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.FileInputStream; @@ -29,7 +29,7 @@ import java.io.InputStream; * class taken from Apache JCI */ public final class FileResourceStore implements ResourceStore { - private static final Logger LOG = LoggerFactory.getLogger(FileResourceStore.class); + private static final Logger LOG = LogManager.getLogger(FileResourceStore.class); private final File root; public FileResourceStore(final File pFile) { http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java index c991f75..19c9524 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java @@ -16,8 +16,8 @@ package com.opensymphony.xwork2.util.classloader; -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.*; import java.util.zip.ZipEntry; @@ -27,7 +27,7 @@ import java.util.zip.ZipFile; * Read resources from a jar file */ public class JarResourceStore implements ResourceStore { - private static final Logger LOG = LoggerFactory.getLogger(JarResourceStore.class); + private static final Logger LOG = LogManager.getLogger(JarResourceStore.class); private final File file; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java index dd84fcb..7c46ee6 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java @@ -19,8 +19,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.XWorkException; -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.ObjectUtils; import java.io.File; @@ -41,7 +41,7 @@ import java.util.regex.Pattern; * class taken from Apache JCI */ public class ReloadingClassLoader extends ClassLoader { - private static final Logger LOG = LoggerFactory.getLogger(ReloadingClassLoader.class); + private static final Logger LOG = LogManager.getLogger(ReloadingClassLoader.class); private final ClassLoader parent; private ResourceStore[] stores; private ClassLoader delegate; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java index dfb0c18..d84c106 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java @@ -15,15 +15,15 @@ */ package com.opensymphony.xwork2.util.classloader; -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; /** * class taken from Apache JCI */ public final class ResourceStoreClassLoader extends ClassLoader { - private static final Logger LOG = LoggerFactory.getLogger(ResourceStoreClassLoader.class); + private static final Logger LOG = LogManager.getLogger(ResourceStoreClassLoader.class); private final ResourceStore[] stores; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java index a80849b..44d4eb2 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java @@ -19,8 +19,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.XWorkException; -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.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassReader; @@ -52,7 +52,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarInputStream; public class DefaultClassFinder implements ClassFinder { - private static final Logger LOG = LoggerFactory.getLogger(DefaultClassFinder.class); + private static final Logger LOG = LogManager.getLogger(DefaultClassFinder.class); private final Map<String, List<Info>> annotated = new HashMap<String, List<Info>>(); private final Map<String, ClassInfo> classInfos = new LinkedHashMap<String, ClassInfo>(); http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java index 47e7642..ffda507 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java @@ -15,8 +15,8 @@ */ package com.opensymphony.xwork2.util.finder; -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 java.io.BufferedInputStream; @@ -47,7 +47,7 @@ import java.util.jar.JarFile; * @version $Rev$ $Date$ */ public class ResourceFinder { - private static final Logger LOG = LoggerFactory.getLogger(ResourceFinder.class); + private static final Logger LOG = LogManager.getLogger(ResourceFinder.class); private final URL[] urls; private final String path; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java index ded02ef..c38d5d5 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java @@ -15,8 +15,8 @@ */ package com.opensymphony.xwork2.util.finder; -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.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -51,7 +51,7 @@ import java.util.Set; */ public class UrlSet { - private static final Logger LOG = LoggerFactory.getLogger(UrlSet.class); + private static final Logger LOG = LogManager.getLogger(UrlSet.class); private final Map<String,URL> urls; private Set<String> protocols; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java index f54d490..b0c93d7 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java @@ -16,8 +16,8 @@ package com.opensymphony.xwork2.util.fs; import com.opensymphony.xwork2.FileManager; -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.IOException; import java.io.InputStream; @@ -36,7 +36,7 @@ import java.util.regex.Pattern; */ public class DefaultFileManager implements FileManager { - private static Logger LOG = LoggerFactory.getLogger(DefaultFileManager.class); + private static Logger LOG = LogManager.getLogger(DefaultFileManager.class); private static final Pattern JAR_PATTERN = Pattern.compile("^(jar:|wsjar:|zip:|vfsfile:|code-source:)?(file:)?(.*?)(\\!/|\\.jar/)(.*)"); private static final int JAR_FILE_PATH = 3; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java index ce53a15..741d297 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java @@ -5,8 +5,8 @@ import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.XWorkConstants; 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 java.util.HashSet; import java.util.Set; @@ -16,7 +16,7 @@ import java.util.Set; */ public class DefaultFileManagerFactory implements FileManagerFactory { - private static final Logger LOG = LoggerFactory.getLogger(DefaultFileManagerFactory.class); + private static final Logger LOG = LogManager.getLogger(DefaultFileManagerFactory.class); private boolean reloadingConfigs; private FileManager systemFileManager; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java index 43fc749..b2c9684 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java @@ -1,8 +1,8 @@ package com.opensymphony.xwork2.util.fs; import com.opensymphony.xwork2.FileManager; -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.io.FileUtils; import java.io.IOException; @@ -15,7 +15,7 @@ import java.util.zip.ZipEntry; */ public class JarEntryRevision extends Revision { - private static Logger LOG = LoggerFactory.getLogger(JarEntryRevision.class); + private static Logger LOG = LogManager.getLogger(JarEntryRevision.class); private static final String JAR_FILE_NAME_SEPARATOR = "!/"; private static final String JAR_FILE_EXTENSION_END = ".jar/"; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java index 13727e5..d9bbf27 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java @@ -26,8 +26,8 @@ */ package com.opensymphony.xwork2.util.profiling; -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; /** @@ -282,7 +282,7 @@ public class UtilTimerStack */ public static final String MIN_TIME = "xwork.profile.mintime"; - private static final Logger LOG = LoggerFactory.getLogger(UtilTimerStack.class); + private static final Logger LOG = LogManager.getLogger(UtilTimerStack.class); /** * Initialized in a static block, it can be changed at runtime by calling setActive(...) http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java index 9b6beb3..b1c475d 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java @@ -26,8 +26,8 @@ import com.opensymphony.xwork2.config.entities.ActionConfig; 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 com.opensymphony.xwork2.validator.validators.VisitorFieldValidator; import org.apache.commons.lang3.StringUtils; @@ -59,7 +59,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager private final Map<String, List<ValidatorConfig>> validatorCache = Collections.synchronizedMap(new HashMap<String, List<ValidatorConfig>>()); private final Map<String, List<ValidatorConfig>> validatorFileCache = Collections.synchronizedMap(new HashMap<String, List<ValidatorConfig>>()); - private static final Logger LOG = LoggerFactory.getLogger(AnnotationActionValidatorManager.class); + private static final Logger LOG = LogManager.getLogger(AnnotationActionValidatorManager.class); private ValidatorFactory validatorFactory; private ValidatorFileParser validatorFileParser; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java index b6d0211..f139401 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.XWorkConstants; 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 com.opensymphony.xwork2.validator.validators.VisitorFieldValidator; import java.io.IOException; @@ -52,7 +52,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager { private final Map<String, List<ValidatorConfig>> validatorCache = Collections.synchronizedMap(new HashMap<String, List<ValidatorConfig>>()); private final Map<String, List<ValidatorConfig>> validatorFileCache = Collections.synchronizedMap(new HashMap<String, List<ValidatorConfig>>()); - private final Logger LOG = LoggerFactory.getLogger(DefaultActionValidatorManager.class); + private final Logger LOG = LogManager.getLogger(DefaultActionValidatorManager.class); private ValidatorFactory validatorFactory; private ValidatorFileParser validatorFileParser; private FileManager fileManager; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java index 0b19e24..3f98023 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java @@ -21,8 +21,8 @@ import com.opensymphony.xwork2.XWorkException; import com.opensymphony.xwork2.config.ConfigurationException; 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 java.io.File; import java.io.FilenameFilter; @@ -50,7 +50,7 @@ import java.util.zip.ZipInputStream; public class DefaultValidatorFactory implements ValidatorFactory { protected Map<String, String> validators = new HashMap<String, String>(); - private static Logger LOG = LoggerFactory.getLogger(DefaultValidatorFactory.class); + private static Logger LOG = LogManager.getLogger(DefaultValidatorFactory.class); protected ObjectFactory objectFactory; protected ValidatorFileParser validatorFileParser; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java index 603b8fa..b640996 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java @@ -21,8 +21,8 @@ import com.opensymphony.xwork2.config.ConfigurationException; import com.opensymphony.xwork2.config.providers.XmlHelper; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.DomHelper; -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.w3c.dom.*; import org.xml.sax.InputSource; @@ -45,7 +45,7 @@ import java.util.*; */ public class DefaultValidatorFileParser implements ValidatorFileParser { - private static Logger LOG = LoggerFactory.getLogger(DefaultValidatorFileParser.class); + private static Logger LOG = LogManager.getLogger(DefaultValidatorFileParser.class); static final String DEFAULT_MULTI_TEXTVALUE_SEPARATOR = " "; static final String MULTI_TEXTVALUE_SEPARATOR_CONFIG_KEY = "xwork.validatorfileparser.multi_textvalue_separator"; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java index 6807926..c47d277 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java @@ -17,8 +17,8 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.*; 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.*; @@ -259,11 +259,11 @@ public class DelegatingValidatorContext implements ValidatorContext { private Logger log; public LoggingValidationAware(Class clazz) { - log = LoggerFactory.getLogger(clazz); + log = LogManager.getLogger(clazz); } public LoggingValidationAware(Object obj) { - log = LoggerFactory.getLogger(obj.getClass()); + log = LogManager.getLogger(obj.getClass()); } public void setActionErrors(Collection<String> errorMessages) { http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java index 3402487..84788ca 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java @@ -21,8 +21,8 @@ import com.opensymphony.xwork2.Validateable; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; import com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil; -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 --> @@ -130,7 +130,7 @@ public class ValidationInterceptor extends MethodFilterInterceptor { private ActionValidatorManager actionValidatorManager; - private static final Logger LOG = LoggerFactory.getLogger(ValidationInterceptor.class); + private static final Logger LOG = LogManager.getLogger(ValidationInterceptor.class); private final static String VALIDATE_PREFIX = "validate"; private final static String ALT_VALIDATE_PREFIX = "validateDo"; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java index 22eb341..183ea65 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java @@ -15,8 +15,8 @@ */ package com.opensymphony.xwork2.validator.validators; -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.validator.ValidationException; import org.apache.commons.lang3.StringUtils; @@ -25,7 +25,7 @@ import org.apache.commons.lang3.StringUtils; */ public abstract class RangeValidatorSupport<T extends Comparable> extends FieldValidatorSupport { - private static final Logger LOG = LoggerFactory.getLogger(RangeValidatorSupport.class); + private static final Logger LOG = LogManager.getLogger(RangeValidatorSupport.class); private final Class<T> type; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java index 0c6fc13..778c522 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java @@ -16,8 +16,8 @@ package com.opensymphony.xwork2.validator.validators; -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.validator.ValidationException; import org.apache.commons.lang3.StringUtils; @@ -80,7 +80,7 @@ import java.util.regex.Pattern; */ public class RegexFieldValidator extends FieldValidatorSupport { - private static final Logger LOG = LoggerFactory.getLogger(RegexFieldValidator.class); + private static final Logger LOG = LogManager.getLogger(RegexFieldValidator.class); private String regex; private String regexExpression; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java index 348b5ce..b6f7014 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java @@ -19,8 +19,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; 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.validator.ValidationException; import org.apache.commons.lang3.StringEscapeUtils; @@ -134,7 +134,7 @@ import java.util.Map; */ public abstract class RepopulateConversionErrorFieldValidatorSupport extends FieldValidatorSupport { - private static final Logger LOG = LoggerFactory.getLogger(RepopulateConversionErrorFieldValidatorSupport.class); + private static final Logger LOG = LogManager.getLogger(RepopulateConversionErrorFieldValidatorSupport.class); private boolean repopulateField = false; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java index 69c5e6a..9dd3f50 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java @@ -17,8 +17,8 @@ package com.opensymphony.xwork2.validator.validators; 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 com.opensymphony.xwork2.validator.DelegatingValidatorContext; import com.opensymphony.xwork2.validator.ShortCircuitableValidator; import com.opensymphony.xwork2.validator.ValidationException; @@ -39,7 +39,7 @@ import java.util.List; */ public abstract class ValidatorSupport implements Validator, ShortCircuitableValidator { - protected final Logger log = LoggerFactory.getLogger(this.getClass()); + protected final Logger log = LogManager.getLogger(this.getClass()); protected String defaultMessage = ""; protected String messageKey; http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java index 23206ab..06e7f06 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java @@ -17,11 +17,7 @@ package com.opensymphony.xwork2; import com.opensymphony.xwork2.util.ValueStack; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.ResourceBundle; +import java.util.*; /** * Unit test for {@link ActionSupport}. http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java b/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java index 8b6eb5a..b27024a 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java @@ -1,7 +1,5 @@ package com.opensymphony.xwork2; -import com.opensymphony.xwork2.DefaultUnknownHandlerManager; - import java.util.ArrayList; /* http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java index f658536..424d607 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java @@ -19,7 +19,7 @@ import com.opensymphony.xwork2.SimpleFooAction; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.mock.MockActionInvocation; import com.opensymphony.xwork2.mock.MockActionProxy; -import com.opensymphony.xwork2.util.logging.Logger; +import org.apache.logging.log4j.Logger; /** * Unit test for {@link TimerInterceptor}.
