This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 8952cffd348f3531ffe8ff6935e89600014e01fe Merge: 6cec3f4 140bea2 Author: Yasser Zamani <yasserzam...@apache.org> AuthorDate: Sat Dec 28 14:04:52 2019 +0330 Merge pull request #391 from apache/WW-5003-drops-xwork-exception [WW-5003] Drops XWorkException and uses StrutsException instead .../com/opensymphony/xwork2/ActionChainResult.java | 3 +- .../com/opensymphony/xwork2/ActionContext.java | 3 +- .../xwork2/DefaultActionInvocation.java | 9 +- .../com/opensymphony/xwork2/UnknownHandler.java | 9 +- .../com/opensymphony/xwork2/XWorkException.java | 144 --------------------- .../xwork2/config/ConfigurationException.java | 22 ++-- .../config/providers/XmlConfigurationProvider.java | 4 +- .../xwork2/conversion/TypeConversionException.java | 13 +- .../xwork2/conversion/impl/DateConverter.java | 6 +- .../xwork2/conversion/impl/NumberConverter.java | 20 +-- .../conversion/impl/XWorkBasicConverter.java | 16 +-- .../xwork2/conversion/impl/XWorkList.java | 4 +- .../interceptor/ScopedModelDrivenInterceptor.java | 4 +- .../annotations/AnnotationWorkflowInterceptor.java | 4 +- .../opensymphony/xwork2/ognl/OgnlValueStack.java | 10 +- .../xwork2/ognl/accessor/CompoundRootAccessor.java | 6 +- .../ognl/accessor/XWorkListPropertyAccessor.java | 6 +- .../opensymphony/xwork2/util/ClassPathFinder.java | 4 +- .../com/opensymphony/xwork2/util/DomHelper.java | 8 +- .../util/classloader/ReloadingClassLoader.java | 6 +- .../util/reflection/ReflectionException.java | 4 +- .../xwork2/validator/DefaultValidatorFactory.java | 4 +- .../java/org/apache/struts2/StrutsException.java | 49 ++++++- .../apache/struts2/util/StrutsTypeConverter.java | 2 +- .../opensymphony/xwork2/ActionInvocationTest.java | 8 +- .../com/opensymphony/xwork2/ChainResultTest.java | 3 +- .../config/providers/SomeUnknownHandler.java | 6 +- .../conversion/impl/XWorkBasicConverterTest.java | 12 +- .../ExceptionMappingInterceptorTest.java | 57 ++++---- .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 4 +- .../xwork2/ognl/OgnlValueStackTest.java | 9 +- .../DefaultActionValidatorManagerTest.java | 4 +- .../validator/DefaultValidatorFileParserTest.java | 10 +- .../apache/struts2/StrutsExceptionTest.java} | 29 +++-- .../providers/xwork-test-exception-mappings.xml | 2 +- .../convention/ConventionUnknownHandler.java | 11 +- .../struts2/convention/DefaultClassFinder.java | 6 +- 37 files changed, 212 insertions(+), 309 deletions(-)