This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch WW-5190-match-action-proxy
in repository https://gitbox.apache.org/repos/asf/struts.git
from ebe1b80ed WW-5190 Adds a new test to cover new logic of comparing
ActionProxies
new 8e468a368 WW-5190 Defines two examples with Dispatcher result and
integration tests
add 0e4d5962e WW-5191 Fixes placement of maxLength and minLength
attributes in <s:textarea/> tag
add e6bc93daf Merge pull request #572 from
apache/WW-5191-textarea-max-length
add fc2aebd10 WW-5187 Comments out Velocity based PageFilter
add dc4e403d3 Merge pull request #570 from apache/WW-5187-velocity
add 3825229f4 WW-5185 Reintroduces proper implementation of Tiles resource
to support wildcard matching of Tiles definitions It was broken after
refactoring related to WW-5011
add 9a2996f9b Uses proper Servlet API 3.1 headers
add 64d054221 Merge pull request #566 from apache/WW-5185-struts-resource
new d639b59f6 Merge branch 'master' into WW-5190-match-action-proxy
new 8c37b1523 WW-5190 Uses proper order of servlets and filters
new ecfdee137 WW-5190 Disables test which won't pass without refactoring
the prepare and execute filters
The 4 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/rest-showcase/src/main/webapp/WEB-INF/web.xml | 7 +-
.../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 +++++++++++
apps/showcase/src/main/webapp/WEB-INF/web.xml | 71 ++++++++++---------
...rManagerTest.java => DispatcherResultTest.java} | 38 +++++-----
.../apache/struts2/views/jsp/ui/TextareaTag.java | 4 +-
.../main/resources/template/simple/textarea.ftl | 14 ++--
.../apache/struts2/views/jsp/ui/TextareaTest.java | 4 ++
.../org/apache/struts2/views/jsp/ui/Textarea-1.txt | 2 +-
.../struts2/sitemesh/VelocityPageFilter.java | 2 +-
.../sitemesh/src/main/resources/struts-plugin.xml | 5 +-
.../struts2/tiles/StrutsApplicationResource.java | 82 ++++++++++++++++++++++
.../StrutsWildcardServletApplicationContext.java | 5 +-
15 files changed, 216 insertions(+), 80 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} (56%)
create mode 100644
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
