struts git commit: Uses proper version of parent
Repository: struts Updated Branches: refs/heads/master ffe0e20ed -> c5cf86a41 Uses proper version of parent Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c5cf86a4 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c5cf86a4 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c5cf86a4 Branch: refs/heads/master Commit: c5cf86a419fb19adf12bd67356fe3fb7345eeff4 Parents: ffe0e20 Author: Lukasz Lenart Authored: Tue May 26 18:12:05 2015 +0200 Committer: Lukasz Lenart Committed: Tue May 26 18:12:25 2015 +0200 -- bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/c5cf86a4/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index a4b9cca..bd234e4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom -2.3.25-SNAPSHOT +2.5-SNAPSHOT pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ -2.3.25-SNAPSHOT +2.5-SNAPSHOT
struts git commit: Cleans up after dropping deprecated plugins
Repository: struts Updated Branches: refs/heads/master c5cf86a41 -> 8c2b321aa Cleans up after dropping deprecated plugins Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8c2b321a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8c2b321a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8c2b321a Branch: refs/heads/master Commit: 8c2b321aa042d9f5d4210d03ad4d8c8ec044f162 Parents: c5cf86a Author: Lukasz Lenart Authored: Tue May 26 18:39:34 2015 +0200 Committer: Lukasz Lenart Committed: Tue May 26 18:39:34 2015 +0200 -- .gitignore | 6 +- assembly/pom.xml| 21 - assembly/src/main/assembly/all.xml | 16 assembly/src/main/assembly/docs.xml | 16 bom/pom.xml | 20 pom.xml | 20 6 files changed, 1 insertion(+), 98 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/.gitignore -- diff --git a/.gitignore b/.gitignore index e95318a..a1e20c7 100644 --- a/.gitignore +++ b/.gitignore @@ -31,10 +31,8 @@ archetypes/struts2-archetype-starter/target archetypes/target plugins/convention/target plugins/embeddedjsp/target -plugins/dojo/target plugins/osgi/target plugins/cdi/target -plugins/codebehind/target plugins/spring/target plugins/jfreechart/target apps/rest-showcase/target @@ -49,13 +47,11 @@ apps/target bundles/admin/target plugins/config-browser/target plugins/jasperreports/target -plugins/jsf/target plugins/json/target plugins/portlet-tiles/target plugins/portlet/target plugins/sitegraph/target plugins/sitemesh/target -plugins/struts1/target plugins/tiles3/target plugins/javatemplates/target bundles/demo/target @@ -70,4 +66,4 @@ plugins/tiles/target bundles/target plugins/target target -plugins/testng/test-output \ No newline at end of file +plugins/testng/test-output http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index 45329d6..e971112 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -150,11 +150,6 @@ org.apache.struts -struts2-codebehind-plugin - - - -org.apache.struts struts2-convention-plugin @@ -170,11 +165,6 @@ org.apache.struts -struts2-dojo-plugin - - - -org.apache.struts struts2-dwr-plugin @@ -190,11 +180,6 @@ org.apache.struts -struts2-jsf-plugin - - - -org.apache.struts struts2-junit-plugin @@ -231,12 +216,6 @@ org.apache.struts struts2-spring-plugin - - -org.apache.struts -struts2-struts1-plugin - - org.apache.struts struts2-testng-plugin http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/assembly/src/main/assembly/all.xml -- diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index acf9c98..9e52856 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -133,10 +133,6 @@ docs/struts2-plugins/struts2-cdi-plugin/apidocs -../plugins/codebehind/target/apidocs - docs/struts2-plugins/struts2-codebehind-plugin/apidocs - - ../plugins/config-browser/target/apidocs docs/struts2-plugins/struts2-config-browser-plugin/apidocs @@ -145,10 +141,6 @@ docs/struts2-plugins/struts2-convention-plugin/apidocs -../plugins/dojo/target/apidocs - docs/struts2-plugins/struts2-dojo-plugin/apidocs - - ../plugins/dwr/target/apidocs docs/struts2-plugins/struts2-dwr-plugin/apidocs @@ -173,10 +165,6 @@ docs/struts2-plugins/struts2-jfreechart-plugin/apidocs -../plugins/jsf/target/apidocs - docs/struts2-plugins/struts2-jsf-plugin/apidocs - - ../plugins/json/target/apidocs docs/struts2-plugins/struts2-json-plugin/apidocs @@ -225,10 +213,6 @@ docs/struts2-plugins/struts2-spring-plugin/apidocs -../plugins/struts1/target/apidocs - docs/struts2-plugins/struts2-struts1-plugin/apidocs - - ../plugins/testng/target/apidocs d
[03/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
--
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
index c4fd827..e637f20 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
@@ -25,8 +25,8 @@ import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
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;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
@@ -96,7 +96,7 @@ import java.util.HashMap;
*/
public class RestActionMapper extends DefaultActionMapper {
-protected static final Logger LOG =
LoggerFactory.getLogger(RestActionMapper.class);
+protected static final Logger LOG =
LogManager.getLogger(RestActionMapper.class);
public static final String HTTP_METHOD_PARAM = "_method";
private String idParameterName = "id";
private String indexMethodName = "index";
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
--
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
index 72193ae..ce794c1 100644
---
a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
+++
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
@@ -27,8 +27,8 @@ import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.inject.Inject;
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.ServletActionContext;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
@@ -134,7 +134,7 @@ public class RestWorkflowInterceptor extends
MethodFilterInterceptor {
private static final long serialVersionUID = 7563014655616490865L;
- private static final Logger LOG =
LoggerFactory.getLogger(RestWorkflowInterceptor.class);
+ private static final Logger LOG =
LogManager.getLogger(RestWorkflowInterceptor.class);
private String inputResultName = Action.INPUT;
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
--
diff --git
a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
index 2a30c34..accfd3b 100644
---
a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
+++
b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
@@ -21,8 +21,8 @@
package org.apache.struts2.sitegraph;
-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 org.apache.struts2.sitegraph.renderers.DOTRenderer;
@@ -45,7 +45,7 @@ import java.io.*;
*/
public class SiteGraph {
-private static final Logger LOG = LoggerFactory.getLogger(SiteGraph.class);
+private static final Logger LOG = LogManager.getLogger(SiteGraph.class);
private String configDir;
private String views;
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
--
diff --git
a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
index 11605fa..1e6b245 100644
---
a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
+++
b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegra
[15/15] struts git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts into WW-4504
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts into WW-4504 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/73ef38d7 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/73ef38d7 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/73ef38d7 Branch: refs/heads/master Commit: 73ef38d72718410cf5f0bbc1b8bc52f50836a885 Parents: fe58d73 8c2b321 Author: Johannes Geppert Authored: Tue May 26 19:14:34 2015 +0200 Committer: Johannes Geppert Committed: Tue May 26 19:14:34 2015 +0200 -- .gitignore | 6 +- assembly/pom.xml| 21 - assembly/src/main/assembly/all.xml | 16 assembly/src/main/assembly/docs.xml | 16 bom/pom.xml | 24 ++-- pom.xml | 20 6 files changed, 3 insertions(+), 100 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/73ef38d7/pom.xml --
[01/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
Repository: struts
Updated Branches:
refs/heads/master 8c2b321aa -> 73ef38d72
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default
one
- Switch to latest log4j2 version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/340312ed
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/340312ed
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/340312ed
Branch: refs/heads/master
Commit: 340312ed3f335e10134f518bceec23230da67e22
Parents: ffe0e20
Author: Johannes Geppert
Authored: Mon May 25 12:25:23 2015 +0200
Committer: Johannes Geppert
Committed: Mon May 25 12:25:23 2015 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/340312ed/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b99e47e..b2acd47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
3.3
5.0.2
2.0.6
-2.2
+2.3
${project.build.directory}/site
[10/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default
one
- Use log4j2 in all provided apps
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/88649ff8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/88649ff8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/88649ff8
Branch: refs/heads/master
Commit: 88649ff82caf180c66afdd49d90b3e0cede09f12
Parents: 8e87711
Author: Johannes Geppert
Authored: Mon May 25 21:42:08 2015 +0200
Committer: Johannes Geppert
Committed: Mon May 25 21:42:08 2015 +0200
--
apps/blank/pom.xml | 12 +-
apps/blank/src/main/resources/log4j2.xml| 4 +-
apps/jboss-blank/pom.xml| 8
apps/jboss-blank/src/main/resources/log4j2.xml | 15 +++
apps/mailreader/pom.xml | 31 ++
.../src/main/resources/log4j.properties | 36
apps/mailreader/src/main/resources/log4j2.xml | 16 +++
apps/portlet/pom.xml| 12 +-
apps/portlet/src/main/resources/log4j.xml | 15 ---
apps/portlet/src/main/resources/log4j2.xml | 15 +++
apps/rest-showcase/pom.xml | 1 +
apps/showcase/pom.xml | 44
.../showcase/action/AbstractCRUDAction.java | 5 ++-
.../struts2/showcase/action/EmployeeAction.java | 5 ++-
.../struts2/showcase/action/SkillAction.java| 5 ++-
.../showcase/application/TestDataProvider.java | 5 ++-
.../src/main/resources/log4j.properties | 33 ---
apps/showcase/src/main/resources/log4j2.xml | 16 +++
.../src/main/webapp/WEB-INF/decorators/main.jsp | 8 ++--
apps/showcase/src/main/webapp/WEB-INF/web.xml | 22 +-
20 files changed, 133 insertions(+), 175 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index f10b53c..cec84f6 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -47,11 +47,7 @@
provided
-
-org.apache.logging.log4j
-log4j-api
-${log4j2.version}
-
+
org.apache.logging.log4j
log4j-core
@@ -78,12 +74,6 @@
src/main/webapp/WEB-INF/web.xml
-
-
-xwork.loggerFactory
-
com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory
-
-
http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/blank/src/main/resources/log4j2.xml
--
diff --git a/apps/blank/src/main/resources/log4j2.xml
b/apps/blank/src/main/resources/log4j2.xml
index aee8b3b..092d5f6 100644
--- a/apps/blank/src/main/resources/log4j2.xml
+++ b/apps/blank/src/main/resources/log4j2.xml
@@ -6,8 +6,8 @@
-
-
+
+
http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 0b395cc..07f0166 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -48,6 +48,14 @@
2.0
provided
+
+
+
+org.apache.logging.log4j
+log4j-core
+${log4j2.version}
+
+
${project.groupId}
struts2-junit-plugin
http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/jboss-blank/src/main/resources/log4j2.xml
--
diff --git a/apps/jboss-blank/src/main/resources/log4j2.xml
b/apps/jboss-blank/src/main/resources/log4j2.xml
new file mode 100644
index 000..abe3dde
--- /dev/null
+++ b/apps/jboss-blank/src/main/resources/log4j2.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 9e3e105..0965639 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -47,6 +47,18 @@
1.3.5
[02/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
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
[04/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
--
diff --git
a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index f9eb4c7..1806573 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -24,8 +24,6 @@ package org.apache.struts2;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
-import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
-import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -37,6 +35,8 @@ import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.inject.ContainerBuilder;
import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
import com.opensymphony.xwork2.mock.MockResult;
+import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.validator.ValidationInterceptor;
import org.apache.struts2.dispatcher.ServletDispatcherResult;
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/core/src/test/java/org/apache/struts2/TestResult.java
--
diff --git a/core/src/test/java/org/apache/struts2/TestResult.java
b/core/src/test/java/org/apache/struts2/TestResult.java
index a1c7774..5927f79 100644
--- a/core/src/test/java/org/apache/struts2/TestResult.java
+++ b/core/src/test/java/org/apache/struts2/TestResult.java
@@ -21,17 +21,16 @@
package org.apache.struts2;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import junit.framework.Assert;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
/**
@@ -43,7 +42,7 @@ public class TestResult implements Result {
private static final long serialVersionUID = -4429258122011663164L;
-private static final Logger LOG =
LoggerFactory.getLogger(TestResult.class);
+private static final Logger LOG = LogManager.getLogger(TestResult.class);
private List expectedValues = new ArrayList();
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
index de8a0bd..106ba5f 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
@@ -22,8 +22,8 @@
package org.apache.struts2.views.jsp;
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 org.apache.commons.beanutils.BeanUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
@@ -38,7 +38,7 @@ import java.util.*;
*/
public abstract class AbstractUITagTest extends AbstractTagTest {
-private static final Logger LOG =
LoggerFactory.getLogger(AbstractUITagTest.class);
+private static final Logger LOG =
LogManager.getLogger(AbstractUITagTest.class);
static final String FREEMARKER_ERROR_EXPECTATION = "Java backtrace for
programmers:";
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
--
diff --git
a/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
b/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
index 13ae6be..08a5ffa 100644
--- a/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
+++ b/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
@@ -
[12/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default
one
- Mark current xwork logging implementation as deprecated so it can be removed
with 3.0
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/26279424
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/26279424
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/26279424
Branch: refs/heads/master
Commit: 26279424f00d4003db7b7bd749f71f6939fc3602
Parents: 93a307b
Author: Johannes Geppert
Authored: Mon May 25 21:49:53 2015 +0200
Committer: Johannes Geppert
Committed: Mon May 25 21:49:53 2015 +0200
--
.../src/main/java/com/opensymphony/xwork2/util/logging/Logger.java | 1 +
.../java/com/opensymphony/xwork2/util/logging/LoggerFactory.java| 1 +
.../main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java | 1 +
.../com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java | 1 +
.../xwork2/util/logging/commons/CommonsLoggerFactory.java | 1 +
.../java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java| 1 +
.../com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java | 1 +
.../com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java | 1 +
.../xwork2/util/logging/log4j2/Log4j2LoggerFactory.java | 1 +
.../com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java | 1 +
.../opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java | 1 +
11 files changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
index 408cb0a..e7da798 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
@@ -18,6 +18,7 @@ package com.opensymphony.xwork2.util.logging;
/**
* Main logger interface for logging things
*/
+@Deprecated
public interface Logger {
void trace(String msg, String... args);
http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
index 0e7445b..29b70df 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
@@ -30,6 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Creates loggers. Static accessor will lazily try to decide on the best
factory if none specified.
*/
+@Deprecated
public abstract class LoggerFactory {
private static final ReadWriteLock lock = new ReentrantReadWriteLock();
http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
index 876b2c7..a513ed2 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
@@ -21,6 +21,7 @@ import java.util.List;
/**
* Logging utility methods
*/
+@Deprecated
public class LoggerUtils {
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
index a06f647..6ee4e0f 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
/**
* Simple logger that delegates to commons logging
*/
+@Deprecated
public class CommonsLogger implements Logger {
private Log log;
http://git-wip-us.apache.org/repos/asf/struts/blob/26279424/xwork-core/
[07/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
http://git-wip-us.apache.org/repos/asf/struts/blob/8e877115/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
index 9599b95..eaae007 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
@@ -313,8 +313,7 @@ public class XWorkConverter extends DefaultTypeConverter {
try {
return tc.convertValue(context, target, member, property,
value, toClass);
} catch (Exception e) {
-if (LOG.isDebugEnabled())
-LOG.debug("unable to convert value using type converter
[#0]", e, tc.getClass().getName());
+LOG.debug("Unable to convert value using type converter [{}]",
tc.getClass().getName(), e);
handleConversionException(context, property, value, target);
return TypeConverter.NO_CONVERSION_POSSIBLE;
@@ -323,24 +322,20 @@ public class XWorkConverter extends DefaultTypeConverter {
if (defaultTypeConverter != null) {
try {
-if (LOG.isDebugEnabled())
-LOG.debug("falling back to default type converter [" +
defaultTypeConverter + "]");
+LOG.debug("Falling back to default type converter [{}]",
defaultTypeConverter);
return defaultTypeConverter.convertValue(context, target,
member, property, value, toClass);
} catch (Exception e) {
-if (LOG.isDebugEnabled())
-LOG.debug("unable to convert value using type converter
[#0]", e, defaultTypeConverter.getClass().getName());
+LOG.debug("Unable to convert value using type converter [{}]",
defaultTypeConverter.getClass().getName(), e);
handleConversionException(context, property, value, target);
return TypeConverter.NO_CONVERSION_POSSIBLE;
}
} else {
try {
-if (LOG.isDebugEnabled())
-LOG.debug("falling back to Ognl's default type
conversion");
+LOG.debug("Falling back to Ognl's default type conversion");
return super.convertValue(value, toClass);
} catch (Exception e) {
-if (LOG.isDebugEnabled())
-LOG.debug("unable to convert value using type converter
[#0]", e, super.getClass().getName());
+LOG.debug("Unable to convert value using type converter [{}]",
super.getClass().getName(), e);
handleConversionException(context, property, value, target);
return TypeConverter.NO_CONVERSION_POSSIBLE;
@@ -368,9 +363,7 @@ public class XWorkConverter extends DefaultTypeConverter {
try {
clazz =
Thread.currentThread().getContextClassLoader().loadClass(className);
} catch (ClassNotFoundException cnfe) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("Cannot load class #0", cnfe, className);
-}
+LOG.debug("Cannot load class {}", className, cnfe);
}
result = lookupSuper(clazz);
@@ -408,9 +401,8 @@ public class XWorkConverter extends DefaultTypeConverter {
}
protected Object getConverter(Class clazz, String property) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("Retrieving convert for class [#0] and property [#1]",
clazz, property);
-}
+LOG.debug("Retrieving convert for class [{}] and property [{}]",
clazz, property);
+
synchronized (clazz) {
if ((property != null) &&
!converterHolder.containsNoMapping(clazz)) {
try {
@@ -423,17 +415,15 @@ public class XWorkConverter extends DefaultTypeConverter {
}
Object converter = mapping.get(property);
-if (LOG.isDebugEnabled() && converter == null) {
-LOG.debug("Converter is null for property [#0].
Mapping size [#1]:", property, mapping.size());
+if (converter == null && LOG.isDebugEnabled()) {
+LOG.debug("Converter is null for property [{}].
Mapping size [{}]:", property, mapping.size());
for (String next : mapping.keySet()) {
-LOG.debug(next + ":" + mapping.get(next));
+LOG.debug("{}:{}", next, mapping.get(next));
}
}
return converter;
} catch (Throwable t) {
-if (LOG.isDebugEnabled()) {
-
[05/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
index c46dc4b..6598d71 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
@@ -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
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
index b4ad906..1f07c42 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
@@ -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
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
index fc14aab..38259eb 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/struts/blob/95805e54/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
index 3550a8e..6cd5eb1 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
@@ -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.opens
[14/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default
one
- Use log4j2 in xwork tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fe58d73f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fe58d73f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fe58d73f
Branch: refs/heads/master
Commit: fe58d73f7a76b490df341fb91f95bb2f349b0adb
Parents: 40fdd16
Author: Johannes Geppert
Authored: Tue May 26 19:10:57 2015 +0200
Committer: Johannes Geppert
Committed: Tue May 26 19:10:57 2015 +0200
--
xwork-core/pom.xml | 7 +++
xwork-core/src/test/resources/log4j.properties | 6 --
xwork-core/src/test/resources/log4j2.xml | 13 +
3 files changed, 20 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/fe58d73f/xwork-core/pom.xml
--
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 5bbe611..fca1912 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -208,6 +208,13 @@
test
+
+org.apache.logging.log4j
+log4j-core
+${log4j2.version}
+test
+
+
org.slf4j
http://git-wip-us.apache.org/repos/asf/struts/blob/fe58d73f/xwork-core/src/test/resources/log4j.properties
--
diff --git a/xwork-core/src/test/resources/log4j.properties
b/xwork-core/src/test/resources/log4j.properties
deleted file mode 100644
index cd27a6c..000
--- a/xwork-core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootLogger = INFO, stdout
-
-log4j.appender.stdout = org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target = System.out
-log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] :
%m%n
http://git-wip-us.apache.org/repos/asf/struts/blob/fe58d73f/xwork-core/src/test/resources/log4j2.xml
--
diff --git a/xwork-core/src/test/resources/log4j2.xml
b/xwork-core/src/test/resources/log4j2.xml
new file mode 100644
index 000..263585e
--- /dev/null
+++ b/xwork-core/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
[09/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one - Use log4j2 placeholder for logging messages and optimize logging a bit Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8e877115 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8e877115 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8e877115 Branch: refs/heads/master Commit: 8e8771153af36b3ce111b5b2289bdab2c8bbd937 Parents: 95805e5 Author: Johannes Geppert Authored: Mon May 25 21:25:50 2015 +0200 Committer: Johannes Geppert Committed: Mon May 25 21:25:50 2015 +0200 -- .../java/org/apache/struts2/RequestUtils.java | 6 +- .../org/apache/struts2/components/Date.java | 6 +- .../org/apache/struts2/components/UIBean.java | 4 +- .../components/template/BaseTemplateEngine.java | 2 +- .../config/AbstractBeanSelectionProvider.java | 10 ++- .../config/DefaultBeanSelectionProvider.java| 6 +- .../DefaultDispatcherErrorHandler.java | 6 +- .../dispatcher/DefaultStaticContentLoader.java | 2 +- .../apache/struts2/dispatcher/Dispatcher.java | 14 ++-- .../struts2/dispatcher/HttpHeaderResult.java| 2 +- .../dispatcher/ServletRedirectResult.java | 16 ++--- .../struts2/dispatcher/VelocityResult.java | 4 +- .../dispatcher/mapper/DefaultActionMapper.java | 10 +-- .../mapper/PrefixBasedActionMapper.java | 28 .../multipart/JakartaMultiPartRequest.java | 19 ++ .../JakartaStreamMultiPartRequest.java | 20 +++--- .../multipart/MultiPartRequestWrapper.java | 2 +- .../impl/PrefixBasedActionProxyFactory.java | 16 ++--- .../interceptor/CheckboxInterceptor.java| 4 +- .../struts2/interceptor/CookieInterceptor.java | 20 +++--- .../interceptor/CookieProviderInterceptor.java | 10 +-- .../struts2/interceptor/I18nInterceptor.java| 6 +- .../struts2/interceptor/RolesInterceptor.java | 2 +- .../org/apache/struts2/util/StrutsUtil.java | 6 +- .../struts2/util/SubsetIteratorFilter.java | 6 +- .../struts2/util/fs/JBossFileManager.java | 28 +++- .../views/freemarker/FreemarkerManager.java | 4 +- .../struts2/views/freemarker/tags/TagModel.java | 4 +- .../struts2/views/util/DefaultUrlHelper.java| 8 +-- .../apache/struts2/views/xslt/BeanAdapter.java | 9 +-- .../apache/struts2/views/xslt/XSLTResult.java | 4 +- .../convention/ConventionUnknownHandler.java| 38 --- .../DefaultInterceptorMapBuilder.java | 2 +- .../convention/DefaultResultMapBuilder.java | 31 - .../PackageBasedActionConfigBuilder.java| 70 .../convention/SEOActionNameBuilder.java| 4 +- .../main/java/org/apache/struts2/JSPLoader.java | 14 ++-- .../jasperreports/ValueStackDataSource.java | 15 ++--- .../struts2/convention/Java8ClassFinder.java| 36 -- .../views/java/DefaultTagHandlerFactory.java| 3 +- .../apache/struts2/views/java/DefaultTheme.java | 4 +- .../struts2/views/java/JavaTemplateEngine.java | 24 ++- .../org/apache/struts2/json/JSONWriter.java | 4 +- .../struts2/osgi/DefaultBundleAccessor.java | 3 +- .../struts2/osgi/OsgiConfigurationProvider.java | 16 ++--- .../java/org/apache/struts2/osgi/OsgiUtil.java | 6 +- .../apache/struts2/osgi/StrutsOsgiListener.java | 5 +- .../apache/struts2/osgi/host/BaseOsgiHost.java | 44 +--- .../apache/struts2/osgi/host/FelixOsgiHost.java | 21 ++ .../struts2/osgi/host/GlassfishOSGiHost.java| 9 +-- .../DefaultOValValidationManager.java | 6 +- .../interceptor/OValValidationInterceptor.java | 22 ++ .../multipart/PellMultiPartRequest.java | 4 +- .../ClassReloadingXMLWebApplicationContext.java | 14 ++-- .../xwork2/DefaultActionInvocation.java | 12 +--- .../opensymphony/xwork2/DefaultActionProxy.java | 4 +- .../xwork2/config/ConfigurationManager.java | 22 ++ .../config/providers/InterceptorBuilder.java| 14 ++-- .../providers/XmlConfigurationProvider.java | 57 .../DefaultConversionAnnotationProcessor.java | 12 ++-- .../impl/DefaultConversionFileProcessor.java| 26 ++-- .../DefaultConversionPropertiesProcessor.java | 10 +-- .../impl/DefaultObjectTypeDeterminer.java | 4 +- .../xwork2/conversion/impl/XWorkConverter.java | 42 +--- .../xwork2/factory/DefaultConverterFactory.java | 4 +- .../interceptor/DefaultWorkflowInterceptor.java | 16 ++--- .../xwork2/interceptor/I18nInterceptor.java | 22 +++--- .../interceptor/ParametersInterceptor.java | 8 +-- .../interceptor/PrefixMethodInvocationUtil.java | 4 +- .../xwork2/ognl/OgnlValueStack.java | 13 ++-- .../xwork2/ognl/SecurityMemberAccess.java | 26 ++-- .../ognl/accessor/CompoundRootAccessor.java | 12 +---
[06/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one - Use log4j2 Logger and LogManager instead of xwork implementation everywhere Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/95805e54 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/95805e54 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/95805e54 Branch: refs/heads/master Commit: 95805e54f79a3c0f63325694c4a2a8a47d7330fd Parents: 340312e Author: Johannes Geppert Authored: Mon May 25 12:42:19 2015 +0200 Committer: Johannes Geppert Committed: Mon May 25 12:42:23 2015 +0200 -- .../src/test/java/example/HelloWorldTest.java | 3 +-- .../java/mailreader2/ApplicationListener.java | 16 +- .../mailreader2/AuthenticationInterceptor.java | 7 --- .../src/main/java/mailreader2/Login.java| 2 +- .../java/mailreader2/MailreaderSupport.java | 11 +- .../chat/ChatAuthenticationInterceptor.java | 6 +++--- .../struts2/showcase/chat/ChatInterceptor.java | 6 +++--- .../showcase/chat/ChatSessionListener.java | 6 +++--- .../struts2/showcase/chat/DateConverter.java| 6 +++--- .../main/java/actions/osgi/BundlesAction.java | 12 --- .../java/actions/osgi/HelloWorldAction.java | 5 - .../META-INF/spring/applicationContext.xml | 5 + core/pom.xml| 13 ++-- .../java/org/apache/struts2/RequestUtils.java | 6 +++--- .../apache/struts2/ServletActionContext.java| 10 - .../struts2/components/ActionComponent.java | 6 +++--- .../org/apache/struts2/components/Anchor.java | 6 +++--- .../struts2/components/AppendIterator.java | 6 +++--- .../org/apache/struts2/components/Bean.java | 6 +++--- .../struts2/components/ClosingUIBean.java | 6 +++--- .../apache/struts2/components/Component.java| 6 +++--- .../org/apache/struts2/components/Date.java | 6 +++--- .../org/apache/struts2/components/File.java | 6 +++--- .../org/apache/struts2/components/I18n.java | 6 +++--- .../org/apache/struts2/components/Include.java | 6 +++--- .../struts2/components/InputTransferSelect.java | 6 +++--- .../struts2/components/IteratorComponent.java | 6 +++--- .../struts2/components/MergeIterator.java | 6 +++--- .../org/apache/struts2/components/Number.java | 6 +++--- .../org/apache/struts2/components/OptGroup.java | 6 +++--- .../components/OptionTransferSelect.java| 6 +++--- .../org/apache/struts2/components/Property.java | 6 +++--- .../struts2/components/ServletUrlRenderer.java | 6 +++--- .../org/apache/struts2/components/Submit.java | 6 +++--- .../org/apache/struts2/components/Text.java | 6 +++--- .../org/apache/struts2/components/UIBean.java | 6 +++--- .../java/org/apache/struts2/components/URL.java | 6 +++--- .../apache/struts2/components/UpDownSelect.java | 6 +++--- .../components/template/BaseTemplateEngine.java | 6 +++--- .../template/FreemarkerTemplateEngine.java | 6 +++--- .../components/template/JspTemplateEngine.java | 6 +++--- .../template/VelocityTemplateEngine.java| 6 +++--- .../config/AbstractBeanSelectionProvider.java | 6 +++--- .../config/DefaultBeanSelectionProvider.java| 6 +++--- .../apache/struts2/config/DefaultSettings.java | 6 +++--- .../struts2/config/PropertiesSettings.java | 6 +++--- .../config/StrutsXmlConfigurationProvider.java | 6 +++--- .../dispatcher/ActionContextCleanUp.java| 6 +++--- .../DefaultDispatcherErrorHandler.java | 6 +++--- .../dispatcher/DefaultStaticContentLoader.java | 6 +++--- .../apache/struts2/dispatcher/Dispatcher.java | 6 +++--- .../struts2/dispatcher/FilterDispatcher.java| 6 -- .../FilterDispatcherCompatWeblogic61.java | 6 +++--- .../struts2/dispatcher/HttpHeaderResult.java| 6 +++--- .../struts2/dispatcher/PlainTextResult.java | 6 +++--- .../dispatcher/ServletDispatcherResult.java | 6 +++--- .../dispatcher/ServletRedirectResult.java | 6 +++--- .../apache/struts2/dispatcher/StreamResult.java | 6 +++--- .../struts2/dispatcher/StrutsResultSupport.java | 6 +++--- .../struts2/dispatcher/VelocityResult.java | 6 +++--- .../mapper/CompositeActionMapper.java | 6 +++--- .../dispatcher/mapper/DefaultActionMapper.java | 6 +++--- .../mapper/PrefixBasedActionMapper.java | 6 +++--- .../dispatcher/mapper/Restful2ActionMapper.java | 6 +++--- .../dispatcher/mapper/RestfulActionMapper.java | 6 +++--- .../multipart/JakartaMultiPartRequest.java | 6 +++--- .../JakartaStreamMultiPartRequest.java | 6 +++--- .../multipart/MultiPartRequestWrapper.java | 6 +++--- .../struts2/dispatcher/ng/InitOperations.java | 2 ++ .../dispatcher/ng/PrepareOperations.java
[08/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
http://git-wip-us.apache.org/repos/asf/struts/blob/8e877115/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index ee6516f..702e1d3 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -143,7 +143,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
this.redirectToSlash = Boolean.parseBoolean(redirectToSlash);
if (LOG.isTraceEnabled()) {
-LOG.trace("Setting action default parent package to [#0]",
defaultParentPackage);
+LOG.trace("Setting action default parent package to [{}]",
defaultParentPackage);
}
this.defaultParentPackage = defaultParentPackage;
@@ -478,8 +478,9 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
if (includeJars == null) {
urlSet = urlSet.exclude(".*?\\.jar(!/|/)?");
} else {
-LOG.debug("jar urls regexes were specified: #0",
Arrays.asList(includeJars));
-
+if(LOG.isDebugEnabled()) {
+LOG.debug("jar urls regexes were specified: {}",
Arrays.asList(includeJars));
+}
List rawIncludedUrls = urlSet.getUrls();
Set includeUrls = new HashSet();
boolean[] patternUsed = new boolean[includeJars.length];
@@ -496,7 +497,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
}
}
} else {
-LOG.debug("It is not a jar [#0]", url);
+LOG.debug("It is not a jar [{}]", url);
includeUrls.add(url);
}
}
@@ -504,7 +505,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
if (LOG.isWarnEnabled()) {
for (int i = 0; i < patternUsed.length; i++) {
if (!patternUsed[i]) {
-LOG.warn("The includeJars pattern [#0] did not match
any jars in the classpath", includeJars[i]);
+LOG.warn("The includeJars pattern [{}] did not match
any jars in the classpath", includeJars[i]);
}
}
}
@@ -637,8 +638,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
try {
return inPackage && (nameMatches || (checkImplementsAction
&& com.opensymphony.xwork2.Action.class.isAssignableFrom(classInfo.get(;
} catch (ClassNotFoundException ex) {
-if (LOG.isErrorEnabled())
-LOG.error("Unable to load class [#0]", ex,
classInfo.getName());
+LOG.error("Unable to load class [{}]", ex,
classInfo.getName());
return false;
}
}
@@ -655,8 +655,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
// Skip classes that can't be instantiated
if (cannotInstantiate(actionClass)) {
-if (LOG.isTraceEnabled())
-LOG.trace("Class [#0] did not pass the instantiation test
and will be ignored", actionClass.getName());
+LOG.trace("Class [{}] did not pass the instantiation test and
will be ignored", actionClass.getName());
continue;
}
@@ -665,8 +664,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
try {
objectFactory.getClassInstance(actionClass.getName());
} catch (ClassNotFoundException e) {
-if (LOG.isErrorEnabled())
-LOG.error("Object Factory was unable to load class
[#0]", e, actionClass.getName());
+LOG.error("Object Factory was unable to load class [{}]",
e, actionClass.getName());
throw new StrutsException("Object Factory was unable to
load class " + actionClass.getName(), e);
}
}
@@ -674,7 +672,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
// Determine the action package
String actionPackage = actionClass.getPackage().getName();
if (LOG.isDebugEnabled()) {
-LOG.debug("Processing class [#0] in package [#1]",
actionClass.getName(), actionPackage);
+LOG.debug("Processing class [{}] in package [{}]",
acti
[11/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default
one
- Use log4j2 in all archetypes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/93a307b9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/93a307b9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/93a307b9
Branch: refs/heads/master
Commit: 93a307b95ea11dcebbd20e6ed205fb2384c17105
Parents: 88649ff
Author: Johannes Geppert
Authored: Mon May 25 21:47:03 2015 +0200
Committer: Johannes Geppert
Committed: Mon May 25 21:47:03 2015 +0200
--
.../main/resources/archetype-resources/pom.xml | 5 -
.../main/resources/archetype-resources/pom.xml | 6 --
.../main/resources/archetype-resources/pom.xml | 5 -
.../main/resources/archetype-resources/pom.xml | 6 ++
.../src/main/resources/log4j2.xml | 16
.../main/resources/archetype-resources/pom.xml | 13 -
.../src/main/resources/log4j.properties | 20
.../src/main/resources/log4j2.xml | 17 +
8 files changed, 43 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/93a307b9/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
index b008115..ff31ad8 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -49,11 +49,6 @@
org.apache.logging.log4j
-log4j-api
-\${log4j2.version}
-
-
-org.apache.logging.log4j
log4j-core
\${log4j2.version}
http://git-wip-us.apache.org/repos/asf/struts/blob/93a307b9/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index 87883a7..e6f625c 100644
---
a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -35,12 +35,6 @@
test
-
-
-org.apache.logging.log4j
-log4j-api
-\${log4j2.version}
-
org.apache.logging.log4j
log4j-core
http://git-wip-us.apache.org/repos/asf/struts/blob/93a307b9/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index ebfb0de..5844509 100644
---
a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -43,11 +43,6 @@
org.apache.logging.log4j
-log4j-api
-\${log4j2.version}
-
-
-org.apache.logging.log4j
log4j-core
\${log4j2.version}
http://git-wip-us.apache.org/repos/asf/struts/blob/93a307b9/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index c254752..62a0e8f 100644
---
a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -92,6 +92,12 @@
provided
+
+org.apache.logging.log4j
+log4j-core
+\${log4j2.version}
+
+
http://git-wip-us.apache.org/repos/asf/struts/blob/93a307b9/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/log4j2.xml
--
diff --git
a/archetyp
[13/15] struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default
one
- Remove not necessary toString() call
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/40fdd167
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/40fdd167
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/40fdd167
Branch: refs/heads/master
Commit: 40fdd167dd1da04e9c7b9bc648c0d057a80b0458
Parents: 2627942
Author: Johannes Geppert
Authored: Tue May 26 18:07:20 2015 +0200
Committer: Johannes Geppert
Committed: Tue May 26 18:07:20 2015 +0200
--
.../xwork2/interceptor/PrefixMethodInvocationUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/40fdd167/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
index 28895a7..5a6e5a1 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
@@ -146,7 +146,7 @@ public class PrefixMethodInvocationUtil {
}
catch (NoSuchMethodException e) {
// hmm -- OK, try next prefix
-LOG.debug("Cannot find method [{}] in action [{}]",
prefixedMethodName, action.toString());
+LOG.debug("Cannot find method [{}] in action [{}]",
prefixedMethodName, action);
}
}
return null;
struts git commit: WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
Repository: struts
Updated Branches:
refs/heads/master 73ef38d72 -> 779b2bd24
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default
one
- Add missing import of LoggerFactory in StrutsInternalTestCase
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/779b2bd2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/779b2bd2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/779b2bd2
Branch: refs/heads/master
Commit: 779b2bd24c4d26d0c4476b4a322334295cd52453
Parents: 73ef38d
Author: geppertj
Authored: Wed May 27 08:39:22 2015 +0200
Committer: geppertj
Committed: Wed May 27 08:39:22 2015 +0200
--
.../test/java/org/apache/struts2/StrutsInternalTestCase.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/779b2bd2/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java
--
diff --git a/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java
b/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java
index 81f575d..0bb1891 100644
--- a/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java
+++ b/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java
@@ -22,6 +22,7 @@
package org.apache.struts2;
import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.util.StrutsTestCaseHelper;
@@ -60,8 +61,9 @@ public abstract class StrutsInternalTestCase extends
XWorkTestCase {
};
handler.setFormatter(formatter);
Logger logger = Logger.getLogger("");
-if (logger.getHandlers().length > 0)
-logger.removeHandler(logger.getHandlers ()[0]);
+if (logger.getHandlers().length > 0) {
+logger.removeHandler(logger.getHandlers()[0]);
+}
logger.addHandler(handler);
logger.setLevel(Level.WARNING);
LoggerFactory.setLoggerFactory(new JdkLoggerFactory());
