WW-4685 Adjusts cherry pick to 2.3.x
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/81371e09 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/81371e09 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/81371e09 Branch: refs/heads/support-2-3 Commit: 81371e09c54a1ba9c2d4d3207567263cc6e62474 Parents: 431e50e Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Sep 16 16:07:59 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Sep 16 16:07:59 2016 +0200 ---------------------------------------------------------------------- .../struts2/tiles/I18NAttributeEvaluator.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/81371e09/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java index 37150ae..29b7ad2 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java @@ -24,24 +24,21 @@ import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.TextProvider; import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.ognl.OgnlUtil; -import ognl.OgnlException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.ServletActionContext; +import org.apache.tiles.context.TilesRequestContext; import org.apache.tiles.evaluator.AbstractAttributeEvaluator; -import org.apache.tiles.evaluator.EvaluationException; -import org.apache.tiles.request.Request; -import org.apache.tiles.request.servlet.ServletUtil; +import org.apache.tiles.servlet.context.ServletUtil; import javax.servlet.http.HttpServletRequest; +import java.util.Map; public class I18NAttributeEvaluator extends AbstractAttributeEvaluator { - private static final Logger LOG = LogManager.getLogger(I18NAttributeEvaluator.class); + private static final Logger LOG = LoggerFactory.getLogger(I18NAttributeEvaluator.class); - @Override - public Object evaluate(String expression, Request request) { + public Object evaluate(String expression, TilesRequestContext request) { Object result = expression; HttpServletRequest httpRequest = ServletUtil.getServletRequest(request).getRequest(); @@ -65,4 +62,6 @@ public class I18NAttributeEvaluator extends AbstractAttributeEvaluator { return result; } + public void init(Map<String, String> initParameters) { + } }
