WW-4540 Implements Strict DMI aka SMI
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b8826816 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b8826816 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b8826816 Branch: refs/heads/master Commit: b8826816550422be78be1f7f86ef28f86ee3ca3c Parents: 48ea26b fdb6dae Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Sep 28 20:51:50 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Sep 28 20:51:50 2015 +0200 ---------------------------------------------------------------------- .../opensymphony/xwork2/DefaultActionProxy.java | 9 +- .../xwork2/DefaultUnknownHandlerManager.java | 1 + .../xwork2/UnknownHandlerManager.java | 1 + .../xwork2/config/entities/ActionConfig.java | 56 +++--- .../xwork2/config/entities/AllowedMethods.java | 172 +++++++++++++++++++ .../xwork2/config/entities/PackageConfig.java | 136 ++++++++------- .../xwork2/config/impl/ActionConfigMatcher.java | 2 +- .../providers/XmlConfigurationProvider.java | 85 +++++++-- .../config/StrutsXmlConfigurationProvider.java | 1 + core/src/main/resources/struts-2.5.dtd | 153 +++++++++++++++++ core/src/main/resources/struts-default.xml | 9 +- core/src/main/resources/xwork-2.5.dtd | 132 ++++++++++++++ .../xwork2/ActionInvocationTest.java | 17 +- .../config/entities/AllowedMethodsTest.java | 55 ++++++ .../config/entities/PackageConfigTest.java | 62 ++++++- .../XmlConfigurationProviderActionsTest.java | 8 +- ...ConfigurationProviderAllowedMethodsTest.java | 4 +- ...figurationProviderExceptionMappingsTest.java | 6 +- .../struts2/TestConfigurationProvider.java | 1 + .../providers/xwork-test-allowed-methods.xml | 2 +- core/src/test/resources/xwork-sample.xml | 6 +- .../convention/ConventionUnknownHandler.java | 6 + .../PackageBasedActionConfigBuilder.java | 32 +++- .../convention/annotation/AllowedMethods.java | 30 ++++ .../PackageBasedActionConfigBuilderTest.java | 60 ++++++- .../ClassLevelAllowedMethodsAction.java | 10 ++ .../PackageLevelAllowedMethodsAction.java | 7 + .../actions/allowedmethods/package-info.java | 23 +++ .../PackageLevelAllowedMethodsChildAction.java | 9 + 29 files changed, 944 insertions(+), 151 deletions(-) ----------------------------------------------------------------------
