WW-4292 Finishes refactoring Dispatcher to avoid passing ServletContext as it is available via field reference
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c9d01e22 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c9d01e22 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c9d01e22 Branch: refs/heads/develop Commit: c9d01e220cb6c2102c741d1e89bca06f61233b32 Parents: ad58c0e c7ca914 Author: Lukasz Lenart <[email protected]> Authored: Wed Feb 19 07:23:37 2014 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Wed Feb 19 07:23:37 2014 +0100 ---------------------------------------------------------------------- .../struts2/components/ActionComponent.java | 41 ++- .../apache/struts2/dispatcher/Dispatcher.java | 90 +++++-- .../struts2/dispatcher/FilterDispatcher.java | 4 +- .../dispatcher/ng/ExecuteOperations.java | 10 +- .../dispatcher/ng/PrepareOperations.java | 11 +- .../ng/filter/StrutsExecuteFilter.java | 4 +- .../filter/StrutsPrepareAndExecuteFilter.java | 4 +- .../ng/filter/StrutsPrepareFilter.java | 2 +- .../dispatcher/ng/listener/StrutsListener.java | 2 +- .../dispatcher/ng/servlet/StrutsServlet.java | 4 +- .../org/apache/struts2/views/jsp/TagUtils.java | 23 +- .../dispatcher/FilterDispatcherTest.java | 4 +- .../apache/struts2/dispatcher/FilterTest.java | 4 +- .../views/freemarker/FreeMarkerResultTest.java | 204 +-------------- .../freemarker/FreemarkerResultMockedTest.java | 262 +++++++++++++++++++ .../struts2/views/jsp/AbstractTagTest.java | 3 +- .../apache/struts2/views/jsp/URLTagTest.java | 3 +- .../dojo/views/jsp/ui/AbstractTagTest.java | 3 +- .../apache/struts2/validators/DWRValidator.java | 12 +- .../apache/struts2/StrutsJUnit4TestCase.java | 2 +- .../java/org/apache/struts2/StrutsTestCase.java | 2 +- .../portlet/dispatcher/Jsr168Dispatcher.java | 7 +- .../OldDecorator2NewStrutsDecorator.java | 2 +- 23 files changed, 411 insertions(+), 292 deletions(-) ----------------------------------------------------------------------
