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 f4ab5bf Merge pull request #413 from
JCgH4164838Gh792C124B5/WW-5074_CfgFix
add f4aa4ee WW-4789 WW-3788 ActionContext refactoring
add fcdaffa WW-4789 WW-3788 Removes duplicated value assignment
add 1a8c751 WW-4789 WW-3788 Uses bind() instead of bound()
add 1bfa1ce WW-4789 WW-3788 Adds instance bind() to simplify bind
operation
add 81b069b WW-4789 WW-3788 Adjusts after rebase
add dfda16d WW-4789 WW-3788 Introduces helper methods to allow build
fluent API
add 273776e WW-4789 WW-3788 Introduces helper methods to allow build
fluent API
add 8e6815e WW-4789 WW-3788 Stops using get()
add df687a6 WW-4789 WW-3788 Marks CONVERSION_ERRORS as deprecated on
behalf using helper methods
add c253b7f WW-4789 WW-3788 Marks CONTAINER as deprecated on behalf using
helper methods
add 6279e6d WW-4789 WW-3788 Avoids unneeded binds to ThreadLocal
add adcc67d WW-4789 WW-3788 Marks VALUE_STACK, APPLICATION and SESSION as
deprecated on behalf using helper methods
add 2f27e45 WW-4789 WW-3788 Marks LOCALE as deprecated on behalf using
helper methods
add f071c9d Reverse merges master
add a504a16 WW-4789 WW-3788 Uses full variable name
add 0cf39a9 WW-4789 WW-3788 Cleans up code & JavaDocs formatting
add 32cbb32 Merge branch 'master' into action-context-boost
add 567ad9c WW-4789 WW-3788 Fixes test after reverse merge
add b96509f Merge branch 'master' into action-context-boost
add 375c3c4 WW-4789 WW-3788 Puts back java.io as an excluded package
new 0129d30 Merge pull request #397 from apache/action-context-boost
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:
.../chat/ChatAuthenticationInterceptor.java | 29 +-
.../struts2/showcase/chat/ChatInterceptor.java | 28 +-
.../com/opensymphony/xwork2/ActionChainResult.java | 13 +-
.../com/opensymphony/xwork2/ActionContext.java | 342 +++++++++++++++++++--
.../xwork2/DefaultActionInvocation.java | 31 +-
.../opensymphony/xwork2/DefaultActionProxy.java | 4 +-
.../opensymphony/xwork2/TextProviderSupport.java | 4 +-
.../com/opensymphony/xwork2/XWorkTestCase.java | 12 +-
.../xwork2/config/impl/DefaultConfiguration.java | 5 +-
.../conversion/impl/DefaultTypeConverter.java | 2 +-
.../xwork2/conversion/impl/XWorkConverter.java | 5 +-
.../xwork2/interceptor/AliasInterceptor.java | 7 +-
.../xwork2/interceptor/ParametersInterceptor.java | 7 +-
.../interceptor/StaticParametersInterceptor.java | 7 +-
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 5 +
.../xwork2/ognl/OgnlValueStackFactory.java | 31 +-
.../interceptor/ActionAutowiringInterceptor.java | 5 +-
.../opensymphony/xwork2/util/TextParseUtil.java | 10 +-
.../com/opensymphony/xwork2/util/ValueStack.java | 44 +--
.../xwork2/util/XWorkTestCaseHelper.java | 18 +-
.../org/apache/struts2/ServletActionContext.java | 40 ++-
.../java/org/apache/struts2/StrutsStatics.java | 38 +--
.../apache/struts2/components/ActionComponent.java | 27 +-
.../struts2/components/ServletUrlRenderer.java | 5 +-
.../template/FreemarkerTemplateEngine.java | 8 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 190 +++++++-----
.../apache/struts2/dispatcher/HttpParameters.java | 1 +
.../apache/struts2/dispatcher/InitOperations.java | 7 +-
.../struts2/dispatcher/PrepareOperations.java | 11 +-
.../dispatcher/listener/StrutsListener.java | 1 -
.../struts2/dispatcher/mapper/ActionMapping.java | 2 +-
.../dispatcher/mapper/DefaultActionMapper.java | 2 +-
.../apache/struts2/factory/StrutsActionProxy.java | 4 +-
.../ActionMappingParametersInterceptor.java | 2 +-
.../struts2/interceptor/BackgroundProcess.java | 4 +-
.../interceptor/CookieProviderInterceptor.java | 2 +-
.../interceptor/CreateSessionInterceptor.java | 9 +-
.../struts2/interceptor/FileUploadInterceptor.java | 3 +-
.../interceptor/MessageStoreInterceptor.java | 2 +-
.../struts2/interceptor/ScopeInterceptor.java | 66 ++--
.../interceptor/ServletConfigInterceptor.java | 16 +-
.../interceptor/TokenSessionStoreInterceptor.java | 6 +-
.../debugging/DebuggingInterceptor.java | 20 +-
.../org/apache/struts2/result/PlainTextResult.java | 28 +-
.../org/apache/struts2/result/PostbackResult.java | 14 +-
.../struts2/result/ServletRedirectResult.java | 75 ++---
.../org/apache/struts2/result/StreamResult.java | 47 +--
.../struts2/util/InvocationSessionStore.java | 29 +-
.../apache/struts2/util/StrutsTestCaseHelper.java | 7 +-
.../java/org/apache/struts2/util/StrutsUtil.java | 6 +-
.../main/java/org/apache/struts2/util/URLBean.java | 3 +-
.../struts2/views/freemarker/FreemarkerResult.java | 36 +--
.../struts2/views/freemarker/tags/TagModel.java | 2 +-
.../struts2/views/jsp/ComponentTagSupport.java | 2 +-
.../org/apache/struts2/views/jsp/TagUtils.java | 9 +-
.../org/apache/struts2/views/util/ContextUtil.java | 46 +--
.../com/opensymphony/xwork2/ActionContextTest.java | 47 ++-
.../xwork2/ActionContextThreadLocalTest.java | 25 +-
.../com/opensymphony/xwork2/ActionNestingTest.java | 38 ++-
.../com/opensymphony/xwork2/ActionSupportTest.java | 102 +++---
.../com/opensymphony/xwork2/ChainResultTest.java | 26 +-
.../xwork2/CompositeTextProviderTest.java | 2 +-
.../xwork2/DefaultTextProviderTest.java | 7 +-
.../com/opensymphony/xwork2/LocaleAwareTest.java | 8 +-
.../com/opensymphony/xwork2/StubValueStack.java | 5 +
.../opensymphony/xwork2/WildCardResultTest.java | 6 +-
.../impl/AnnotationXWorkConverterTest.java | 82 ++---
.../conversion/impl/NumberConverterTest.java | 101 +++---
.../conversion/impl/StringConverterTest.java | 18 +-
.../conversion/impl/XWorkBasicConverterTest.java | 27 +-
.../xwork2/conversion/impl/XWorkConverterTest.java | 177 +++++------
.../interceptor/ChainingInterceptorTest.java | 2 +-
.../ConversionErrorInterceptorTest.java | 15 +-
.../DefaultWorkflowInterceptorTest.java | 26 +-
.../ExceptionMappingInterceptorTest.java | 2 +-
.../ParameterFilterInterceptorTest.java | 20 +-
.../ParameterRemoverInterceptorTest.java | 191 ++++++------
.../ScopedModelDrivenInterceptorTest.java | 18 +-
.../interceptor/ValidationErrorAwareTest.java | 21 +-
...ationInterceptorPrefixMethodInvocationTest.java | 98 +++---
.../AnnotationParameterFilterInterceptorTest.java | 313 ++++++++++---------
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 8 +-
.../xwork2/ognl/OgnlValueStackTest.java | 51 +--
.../ActionAutowiringInterceptorTest.java | 15 +-
.../util/StrutsLocalizedTextProviderTest.java | 20 +-
.../AnnotationActionValidatorManagerTest.java | 2 +-
...notationValidationConfigurationBuilderTest.java | 2 +-
.../ConversionErrorFieldValidatorTest.java | 14 +-
.../DefaultActionValidatorManagerTest.java | 5 +-
.../validator/DoubleRangeFieldValidatorTest.java | 12 +-
.../xwork2/validator/ExpressionValidatorTest.java | 2 +-
.../xwork2/validator/RegexFieldValidatorTest.java | 34 +-
...teConversionErrorFieldValidatorSupportTest.java | 3 +-
.../validator/SimpleActionValidationTest.java | 6 +-
.../xwork2/validator/StringValidatorTest.java | 2 +-
.../validator/VisitorFieldValidatorModelTest.java | 5 +-
.../validator/VisitorFieldValidatorTest.java | 46 +--
.../validators/DateRangeFieldValidatorTest.java | 10 +-
.../validator/validators/ValidatorSupportTest.java | 42 +--
.../apache/struts2/ServletActionContextTest.java | 10 +-
.../struts2/components/ActionComponentTest.java | 16 +-
.../apache/struts2/components/ComponentTest.java | 2 +-
.../org/apache/struts2/components/FormTest.java | 2 +-
.../apache/struts2/components/UIComponentTest.java | 1 -
.../apache/struts2/dispatcher/DispatcherTest.java | 2 +-
.../struts2/dispatcher/PrepareOperationsTest.java | 2 +-
.../dispatcher/TwoFilterIntegrationTest.java | 21 +-
.../interceptor/ClearSessionInterceptorTest.java | 9 +-
.../interceptor/CreateSessionInterceptorTest.java | 13 +-
.../interceptor/ExecuteAndWaitInterceptorTest.java | 45 +--
.../interceptor/FileUploadInterceptorTest.java | 8 +-
.../struts2/interceptor/I18nInterceptorTest.java | 25 +-
.../interceptor/MessageStoreInterceptorTest.java | 83 +++--
.../MessageStorePreResultListenerTest.java | 26 +-
.../interceptor/ServletConfigInterceptorTest.java | 6 +-
.../StrutsConversionErrorInterceptorTest.java | 5 +-
.../struts2/interceptor/TokenInterceptorTest.java | 33 +-
.../AnnotationValidationInterceptorTest.java | 2 +-
.../struts2/result/HttpHeaderResultTest.java | 2 +-
.../apache/struts2/result/PlainTextResultTest.java | 2 +-
.../struts2/result/ServletRedirectResultTest.java | 110 ++++---
.../struts2/util/InvocationSessionStoreTest.java | 55 ++--
.../org/apache/struts2/util/TokenHelperTest.java | 67 ++--
.../views/freemarker/FreeMarkerResultTest.java | 32 +-
.../freemarker/FreemarkerResultMockedTest.java | 43 ++-
.../struts2/views/freemarker/FreemarkerTest.java | 2 +-
.../apache/struts2/views/jsp/AbstractTagTest.java | 26 +-
.../struts2/views/jsp/AbstractUITagTest.java | 2 +-
.../apache/struts2/views/jsp/ActionTagTest.java | 26 +-
.../org/apache/struts2/views/jsp/I18nTagTest.java | 1 -
.../org/apache/struts2/views/jsp/IfTagTest.java | 1 -
.../apache/struts2/views/jsp/NumberTagTest.java | 14 +-
.../org/apache/struts2/views/jsp/TextTagTest.java | 56 ++--
.../org/apache/struts2/views/jsp/URLTagTest.java | 34 +-
.../apache/struts2/views/jsp/ui/DebugTagTest.java | 2 +-
.../apache/struts2/views/jsp/ui/FormTagTest.java | 4 +-
.../apache/struts2/views/util/ContextUtilTest.java | 2 +-
.../struts2/views/util/DefaultUrlHelperTest.java | 2 +-
.../PackageBasedActionConfigBuilderTest.java | 8 +-
.../apache/struts2/validators/DWRValidator.java | 8 +-
.../main/java/org/apache/struts2/JSPLoader.java | 6 +-
.../main/java/org/apache/struts2/JSPRuntime.java | 5 +-
.../org/apache/struts2/EmbeddedJSPResultTest.java | 62 ++--
.../views/jasperreports/JasperReportsResult.java | 10 +-
.../struts2/views/java/simple/AbstractTest.java | 54 ++--
.../struts2/views/java/simple/TokenTest.java | 6 +-
.../apache/struts2/dispatcher/ChartResultTest.java | 2 -
.../java/org/apache/struts2/json/JSONResult.java | 69 ++---
.../org/apache/struts2/json/smd/SMDGenerator.java | 13 +-
.../apache/struts2/json/JSONInterceptorTest.java | 14 +-
.../json/JSONValidationInterceptorTest.java | 2 +-
.../org/apache/struts2/StrutsJUnit4TestCase.java | 6 +-
.../org/apache/struts2/StrutsPortletTestCase.java | 2 +-
.../org/apache/struts2/StrutsRestTestCase.java | 48 ++-
.../java/org/apache/struts2/StrutsTestCase.java | 6 +-
.../struts2/osgi/OsgiConfigurationProvider.java | 9 +-
.../struts2/components/PortletUrlRenderer.java | 4 +-
.../portlet/dispatcher/Jsr168Dispatcher.java | 187 ++++++-----
.../portlet/dispatcher/Jsr286Dispatcher.java | 4 +-
.../portlet/result/PortletVelocityResult.java | 4 +-
.../apache/struts2/StrutsTestCasePortletTests.java | 4 +-
.../struts2/components/PortletUrlRendererTest.java | 2 +-
.../portlet/context/PortletActionContextTest.java | 6 +-
.../interceptor/PortletAwareInterceptorTest.java | 12 +-
.../interceptor/PortletStateInterceptorTest.java | 230 +++++++-------
.../struts2/portlet/result/PortletResultTest.java | 81 ++---
.../struts2/portlet/util/PortletUrlHelperTest.java | 148 +++++----
.../struts2/views/jsp/PortletUrlTagTest.java | 244 ++++++++-------
.../struts2/rest/RestWorkflowInterceptor.java | 133 ++++----
.../rest/ContentTypeHandlerManagerTest.java | 20 +-
.../struts2/rest/RestWorkflowInterceptorTest.java | 8 +-
.../struts2/rest/handler/JuneauXmlHandlerTest.java | 3 +-
.../sitemesh/FreemarkerDecoratorServlet.java | 31 +-
.../sitemesh/OldDecorator2NewStrutsDecorator.java | 4 +-
.../struts2/sitemesh/VelocityDecoratorServlet.java | 2 +-
.../velocity/components/AbstractDirective.java | 2 +-
.../views/velocity/result/VelocityResult.java | 4 +-
.../views/velocity/result/VelocityResultTest.java | 1 -
178 files changed, 2680 insertions(+), 2613 deletions(-)
