Uses new constructors of Prepare and Execution without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ba0eda0c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ba0eda0c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ba0eda0c Branch: refs/heads/feature/WW-4292-dont-use-servletcontext Commit: ba0eda0c5469dabb4b48461a2a013397ee633302 Parents: 8746fd1 Author: Lukasz Lenart <[email protected]> Authored: Mon Feb 17 09:32:19 2014 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Mon Feb 17 09:32:19 2014 +0100 ---------------------------------------------------------------------- .../apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java | 4 ++-- .../dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java | 4 ++-- .../apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java | 2 +- .../apache/struts2/dispatcher/ng/listener/StrutsListener.java | 2 +- .../org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java index bd522bb..7f8164f 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java @@ -57,8 +57,8 @@ public class StrutsExecuteFilter implements StrutsStatics, Filter { Dispatcher dispatcher = init.findDispatcherOnThread(); init.initStaticContentLoader(new FilterHostConfig(filterConfig), dispatcher); - prepare = new PrepareOperations(filterConfig.getServletContext(), dispatcher); - execute = new ExecuteOperations(filterConfig.getServletContext(), dispatcher); + prepare = new PrepareOperations(dispatcher); + execute = new ExecuteOperations(dispatcher); } } http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java index 1c3d3b4..970d8e7 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java @@ -57,8 +57,8 @@ public class StrutsPrepareAndExecuteFilter implements StrutsStatics, Filter { dispatcher = init.initDispatcher(config); init.initStaticContentLoader(config, dispatcher); - prepare = new PrepareOperations(filterConfig.getServletContext(), dispatcher); - execute = new ExecuteOperations(filterConfig.getServletContext(), dispatcher); + prepare = new PrepareOperations(dispatcher); + execute = new ExecuteOperations(dispatcher); this.excludedPatterns = init.buildExcludedPatternsList(dispatcher); postInit(dispatcher, filterConfig); http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java index ea0e510..27ce17e 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java @@ -55,7 +55,7 @@ public class StrutsPrepareFilter implements StrutsStatics, Filter { init.initLogging(config); dispatcher = init.initDispatcher(config); - prepare = new PrepareOperations(filterConfig.getServletContext(), dispatcher); + prepare = new PrepareOperations(dispatcher); this.excludedPatterns = init.buildExcludedPatternsList(dispatcher); postInit(dispatcher, filterConfig); http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java index 113d026..92c49ac 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java @@ -46,7 +46,7 @@ public class StrutsListener implements ServletContextListener { dispatcher = init.initDispatcher(config); init.initStaticContentLoader(config, dispatcher); - prepare = new PrepareOperations(config.getServletContext(), dispatcher); + prepare = new PrepareOperations(dispatcher); sce.getServletContext().setAttribute(StrutsStatics.SERVLET_DISPATCHER, dispatcher); } finally { if (dispatcher != null) { http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java index 9ea669f..19c8c73 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java @@ -54,8 +54,8 @@ public class StrutsServlet extends HttpServlet { dispatcher = init.initDispatcher(config); init.initStaticContentLoader(config, dispatcher); - prepare = new PrepareOperations(filterConfig.getServletContext(), dispatcher); - execute = new ExecuteOperations(filterConfig.getServletContext(), dispatcher); + prepare = new PrepareOperations(dispatcher); + execute = new ExecuteOperations(dispatcher); } finally { if (dispatcher != null) { dispatcher.cleanUpAfterInit();
