[struts] branch master updated (960682ae8 -> 48e57b70b)

[lu...@apache.org]

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 960682ae8 Merge pull request #664 from atlassian/WW-5288-exemption-strict
     new 6aee0eb20 WW-5293 Update deprecations
     new 92ac50c79 WW-5293 Make Struts DTDs static
     new 250aeb3e0 WW-5293 Hide documents in XmlConfigurationProvider
     new 4f5e0ef49 WW-5293 Split XmlConfigurationProvider into XmlDocConfigurationProvider Part 1
     new 8db9e3943 WW-5293 Split XmlConfigurationProvider into XmlDocConfigurationProvider Part 2
     new f2e2c0595 WW-5293 Split #buildActionConfig from #addAction
     new fb03589c7 WW-5293 Split #buildInterceptorConfig from #loadInterceptors
     new 3689d3f25 WW-5293 Define protected field addedResultTypes and split #buildResultConfig from #buildResults
     new 7fa67c290 WW-5293 Add protected #loadClass
     new c27cf4833 WW-5293 Fix trying to clear immutable list
     new 4bc790dd5 WW-5293 Split #buildResultTypeConfig from #addResultTypes and remove unused field and param
     new bd805cd68 WW-5293 Make more methods overridable
     new c11334c60 WW-5293 Add JavaDoc for XmlDocConfigurationProvider class
     new 48e57b70b Merge pull request #668 from atlassian/xml-config-provider-versatile

The 6570 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:
 .../config/providers/XmlConfigurationProvider.java | 975 ++-------------------
 ...vider.java => XmlDocConfigurationProvider.java} | 540 +++++-------
 .../config/StrutsXmlConfigurationProvider.java     |  47 +-
 .../org/apache/struts2/dispatcher/Dispatcher.java  |  16 +-
 .../providers/XmlConfigurationProviderTest.java    |   2 +-
 5 files changed, 293 insertions(+), 1287 deletions(-)
 copy core/src/main/java/com/opensymphony/xwork2/config/providers/{XmlConfigurationProvider.java => XmlDocConfigurationProvider.java} (80%)