This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 836a27692 Merge pull request #578 from sepe81/update-jasperreports
add 5af840b16 WW-5190 Extracts method name from config for known action
name
add 1c2b491a2 WW-5190 Reuses action proxy if namespace, name and method
are match
add 69102e907 WW-5190 Uses wrapped request only when processing request by
Struts
add a6a452950 Fixes logging in Showcase app
add 06290cef9 Fixes showing configuration of an action in Showcase app
add 957292ecd Simplifies logging pattern in Showcase app
add ebe1b80ed WW-5190 Adds a new test to cover new logic of comparing
ActionProxies
add 8e468a368 WW-5190 Defines two examples with Dispatcher result and
integration tests
add d639b59f6 Merge branch 'master' into WW-5190-match-action-proxy
add 8c37b1523 WW-5190 Uses proper order of servlets and filters
add ecfdee137 WW-5190 Disables test which won't pass without refactoring
the prepare and execute filters
add cb5997490 WW-5190 Marks all Struts related filters with
<async-supported/>
new f3cb89202 Merge pull request #571 from
apache/WW-5190-match-action-proxy
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apps/showcase/pom.xml | 9 +-
.../struts2/showcase/source/ViewSourceAction.java | 385 ++++++++++-----------
apps/showcase/src/main/resources/log4j2.xml | 9 +-
.../src/main/resources/struts-dispatcher.xml | 16 +-
apps/showcase/src/main/resources/struts.xml | 2 +
.../src/main/webapp/WEB-INF/decorators/main.jsp | 2 +
.../webapp/WEB-INF/dispatcher/dispatch-result.jsp | 42 +++
.../src/main/webapp/WEB-INF/viewSource.jsp | 75 ++--
apps/showcase/src/main/webapp/WEB-INF/web.xml | 27 +-
...rManagerTest.java => DispatcherResultTest.java} | 39 +--
.../org/apache/struts2/dispatcher/Dispatcher.java | 49 ++-
.../filter/StrutsPrepareAndExecuteFilter.java | 8 +-
.../dispatcher/mapper/DefaultActionMapper.java | 120 ++++---
.../apache/struts2/dispatcher/DispatcherTest.java | 198 ++++++-----
14 files changed, 540 insertions(+), 441 deletions(-)
copy plugins/junit/src/test/resources/struts-convention-configuration.xml =>
apps/showcase/src/main/resources/struts-dispatcher.xml (73%)
create mode 100644
apps/showcase/src/main/webapp/WEB-INF/dispatcher/dispatch-result.jsp
copy
apps/showcase/src/test/java/it/org/apache/struts2/showcase/{FreeMarkerManagerTest.java
=> DispatcherResultTest.java} (54%)
