You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/06/17 20:13:24 UTC
[04/11] struts git commit: Merge branch 'master' of
github.com:apache/struts
Merge branch 'master' of github.com:apache/struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b922d5aa
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b922d5aa
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b922d5aa
Branch: refs/heads/master
Commit: b922d5aad1c91510d7a77443b8e21078fb7bab3a
Parents: 08fad71 73ef38d
Author: Aaron Johnson <aa...@pearson.com>
Authored: Tue May 26 15:41:20 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Tue May 26 15:41:20 2015 -0500
----------------------------------------------------------------------
.gitignore | 6 +-
apps/blank/pom.xml | 12 +---
apps/blank/src/main/resources/log4j2.xml | 4 +-
apps/jboss-blank/pom.xml | 8 +++
apps/jboss-blank/src/main/resources/log4j2.xml | 15 ++++
.../src/test/java/example/HelloWorldTest.java | 3 +-
apps/mailreader/pom.xml | 31 ++++----
.../java/mailreader2/ApplicationListener.java | 16 ++---
.../mailreader2/AuthenticationInterceptor.java | 7 +-
.../src/main/java/mailreader2/Login.java | 2 +-
.../java/mailreader2/MailreaderSupport.java | 11 ++-
.../src/main/resources/log4j.properties | 36 ----------
apps/mailreader/src/main/resources/log4j2.xml | 16 +++++
apps/portlet/pom.xml | 12 +++-
apps/portlet/src/main/resources/log4j.xml | 15 ----
apps/portlet/src/main/resources/log4j2.xml | 15 ++++
apps/rest-showcase/pom.xml | 1 +
apps/showcase/pom.xml | 44 +++++-------
.../showcase/action/AbstractCRUDAction.java | 5 +-
.../struts2/showcase/action/EmployeeAction.java | 5 +-
.../struts2/showcase/action/SkillAction.java | 5 +-
.../showcase/application/TestDataProvider.java | 5 +-
.../chat/ChatAuthenticationInterceptor.java | 6 +-
.../struts2/showcase/chat/ChatInterceptor.java | 6 +-
.../showcase/chat/ChatSessionListener.java | 6 +-
.../struts2/showcase/chat/DateConverter.java | 6 +-
.../src/main/resources/log4j.properties | 33 ---------
apps/showcase/src/main/resources/log4j2.xml | 16 +++++
.../src/main/webapp/WEB-INF/decorators/main.jsp | 8 ++-
apps/showcase/src/main/webapp/WEB-INF/web.xml | 22 +-----
.../main/resources/archetype-resources/pom.xml | 5 --
.../main/resources/archetype-resources/pom.xml | 6 --
.../main/resources/archetype-resources/pom.xml | 5 --
.../main/resources/archetype-resources/pom.xml | 6 ++
.../src/main/resources/log4j2.xml | 16 +++++
.../main/resources/archetype-resources/pom.xml | 13 ++--
.../src/main/resources/log4j.properties | 20 ------
.../src/main/resources/log4j2.xml | 17 +++++
assembly/pom.xml | 21 ------
assembly/src/main/assembly/all.xml | 16 -----
assembly/src/main/assembly/docs.xml | 16 -----
bom/pom.xml | 24 +------
.../main/java/actions/osgi/BundlesAction.java | 12 ++--
.../java/actions/osgi/HelloWorldAction.java | 5 --
.../META-INF/spring/applicationContext.xml | 5 +-
core/pom.xml | 13 ++--
.../java/org/apache/struts2/RequestUtils.java | 12 ++--
.../apache/struts2/ServletActionContext.java | 10 ++-
.../struts2/components/ActionComponent.java | 6 +-
.../org/apache/struts2/components/Anchor.java | 6 +-
.../struts2/components/AppendIterator.java | 6 +-
.../org/apache/struts2/components/Bean.java | 6 +-
.../struts2/components/ClosingUIBean.java | 6 +-
.../apache/struts2/components/Component.java | 6 +-
.../org/apache/struts2/components/Date.java | 12 ++--
.../org/apache/struts2/components/File.java | 6 +-
.../org/apache/struts2/components/I18n.java | 6 +-
.../org/apache/struts2/components/Include.java | 6 +-
.../struts2/components/InputTransferSelect.java | 6 +-
.../struts2/components/IteratorComponent.java | 6 +-
.../struts2/components/MergeIterator.java | 6 +-
.../org/apache/struts2/components/Number.java | 6 +-
.../org/apache/struts2/components/OptGroup.java | 6 +-
.../components/OptionTransferSelect.java | 6 +-
.../org/apache/struts2/components/Property.java | 6 +-
.../struts2/components/ServletUrlRenderer.java | 6 +-
.../org/apache/struts2/components/Submit.java | 6 +-
.../org/apache/struts2/components/Text.java | 6 +-
.../org/apache/struts2/components/UIBean.java | 10 ++-
.../java/org/apache/struts2/components/URL.java | 6 +-
.../apache/struts2/components/UpDownSelect.java | 6 +-
.../components/template/BaseTemplateEngine.java | 8 +--
.../template/FreemarkerTemplateEngine.java | 6 +-
.../components/template/JspTemplateEngine.java | 6 +-
.../template/VelocityTemplateEngine.java | 6 +-
.../config/AbstractBeanSelectionProvider.java | 16 ++---
.../config/DefaultBeanSelectionProvider.java | 12 ++--
.../apache/struts2/config/DefaultSettings.java | 6 +-
.../struts2/config/PropertiesSettings.java | 6 +-
.../config/StrutsXmlConfigurationProvider.java | 6 +-
.../dispatcher/ActionContextCleanUp.java | 6 +-
.../DefaultDispatcherErrorHandler.java | 12 ++--
.../dispatcher/DefaultStaticContentLoader.java | 8 +--
.../apache/struts2/dispatcher/Dispatcher.java | 20 +++---
.../struts2/dispatcher/FilterDispatcher.java | 6 +-
.../FilterDispatcherCompatWeblogic61.java | 6 +-
.../struts2/dispatcher/HttpHeaderResult.java | 8 +--
.../struts2/dispatcher/PlainTextResult.java | 6 +-
.../dispatcher/ServletDispatcherResult.java | 6 +-
.../dispatcher/ServletRedirectResult.java | 22 ++----
.../apache/struts2/dispatcher/StreamResult.java | 6 +-
.../struts2/dispatcher/StrutsResultSupport.java | 6 +-
.../struts2/dispatcher/VelocityResult.java | 10 ++-
.../mapper/CompositeActionMapper.java | 6 +-
.../dispatcher/mapper/DefaultActionMapper.java | 16 ++---
.../mapper/PrefixBasedActionMapper.java | 34 ++++-----
.../dispatcher/mapper/Restful2ActionMapper.java | 6 +-
.../dispatcher/mapper/RestfulActionMapper.java | 6 +-
.../multipart/JakartaMultiPartRequest.java | 25 +++----
.../JakartaStreamMultiPartRequest.java | 26 ++++---
.../multipart/MultiPartRequestWrapper.java | 8 +--
.../struts2/dispatcher/ng/InitOperations.java | 2 +
.../dispatcher/ng/PrepareOperations.java | 8 +--
.../impl/PrefixBasedActionProxyFactory.java | 22 +++---
.../interceptor/CheckboxInterceptor.java | 10 ++-
.../interceptor/ClearSessionInterceptor.java | 6 +-
.../struts2/interceptor/CookieInterceptor.java | 26 ++++---
.../interceptor/CookieProviderInterceptor.java | 16 ++---
.../interceptor/CreateSessionInterceptor.java | 6 +-
.../interceptor/DateTextFieldInterceptor.java | 6 +-
.../interceptor/DeprecationInterceptor.java | 6 +-
.../interceptor/ExecuteAndWaitInterceptor.java | 6 +-
.../interceptor/FileUploadInterceptor.java | 6 +-
.../struts2/interceptor/I18nInterceptor.java | 6 +-
.../interceptor/MessageStoreInterceptor.java | 6 +-
.../struts2/interceptor/RolesInterceptor.java | 8 +--
.../struts2/interceptor/ScopeInterceptor.java | 6 +-
.../debugging/DebuggingInterceptor.java | 6 +-
.../apache/struts2/util/IteratorGenerator.java | 6 +-
.../apache/struts2/util/SortIteratorFilter.java | 6 +-
.../org/apache/struts2/util/StrutsUtil.java | 12 ++--
.../struts2/util/SubsetIteratorFilter.java | 14 ++--
.../apache/struts2/util/TextProviderHelper.java | 6 +-
.../org/apache/struts2/util/TokenHelper.java | 6 +-
.../struts2/util/fs/JBossFileManager.java | 34 ++++-----
.../views/freemarker/FreemarkerManager.java | 10 ++-
.../views/freemarker/FreemarkerResult.java | 6 +-
.../struts2/views/freemarker/tags/TagModel.java | 10 ++-
.../org/apache/struts2/views/jsp/BeanTag.java | 6 +-
.../jsp/iterator/IteratorGeneratorTag.java | 6 +-
.../views/jsp/iterator/SubsetIteratorTag.java | 6 +-
.../views/jsp/ui/AbstractUITagBeanInfo.java | 6 +-
.../struts2/views/util/DefaultUrlHelper.java | 14 ++--
.../struts2/views/velocity/VelocityManager.java | 6 +-
.../struts2/views/xslt/AbstractAdapterNode.java | 10 +--
.../apache/struts2/views/xslt/ArrayAdapter.java | 6 +-
.../apache/struts2/views/xslt/BeanAdapter.java | 15 ++--
.../struts2/views/xslt/CollectionAdapter.java | 6 +-
.../struts2/views/xslt/ProxyElementAdapter.java | 6 +-
.../struts2/views/xslt/ProxyNodeAdapter.java | 6 +-
.../struts2/views/xslt/ServletURIResolver.java | 6 +-
.../struts2/views/xslt/SimpleNodeList.java | 6 +-
.../struts2/views/xslt/StringAdapter.java | 6 +-
.../apache/struts2/views/xslt/XSLTResult.java | 10 ++-
.../apache/struts2/ClassInstantiationTest.java | 2 -
.../struts2/ExecutionCountTestAction.java | 6 +-
.../struts2/ServletActionContextTest.java | 14 ++--
.../apache/struts2/StrutsInternalTestCase.java | 7 +-
.../java/org/apache/struts2/TestAction.java | 6 +-
.../struts2/TestConfigurationProvider.java | 4 +-
.../java/org/apache/struts2/TestResult.java | 15 ++--
.../struts2/views/jsp/AbstractUITagTest.java | 6 +-
.../apache/struts2/cdi/CdiObjectFactory.java | 6 +-
.../config_browser/ShowConfigAction.java | 6 +-
.../config_browser/ShowValidatorAction.java | 6 +-
.../convention/ConventionUnknownHandler.java | 44 +++++-------
.../DefaultInterceptorMapBuilder.java | 10 +--
.../convention/DefaultResultMapBuilder.java | 37 ++++------
.../PackageBasedActionConfigBuilder.java | 76 ++++++++------------
.../convention/SEOActionNameBuilder.java | 10 ++-
.../apache/struts2/validators/DWRValidator.java | 6 +-
.../main/java/org/apache/struts2/JSPLoader.java | 20 ++----
.../jasperreports/JasperReportsResult.java | 6 +-
.../jasperreports/ValueStackDataSource.java | 21 ++----
.../struts2/convention/Java8ClassFinder.java | 42 +++++------
.../convention/Java8ClassFinderFactory.java | 6 +-
.../views/java/DefaultTagHandlerFactory.java | 9 ++-
.../apache/struts2/views/java/DefaultTheme.java | 10 ++-
.../struts2/views/java/JavaTemplateEngine.java | 30 +++-----
.../apache/struts2/dispatcher/ChartResult.java | 6 +-
.../org/apache/struts2/json/JSONCleaner.java | 6 +-
.../apache/struts2/json/JSONInterceptor.java | 6 +-
.../org/apache/struts2/json/JSONPopulator.java | 6 +-
.../org/apache/struts2/json/JSONResult.java | 6 +-
.../java/org/apache/struts2/json/JSONUtil.java | 6 +-
.../struts2/json/JSONValidationInterceptor.java | 6 +-
.../org/apache/struts2/json/JSONWriter.java | 10 +--
.../org/apache/struts2/json/rpc/RPCError.java | 6 +-
.../apache/struts2/json/smd/SMDGenerator.java | 6 +-
.../apache/struts2/StrutsJUnit4TestCase.java | 1 +
.../java/org/apache/struts2/StrutsTestCase.java | 1 +
.../junit/src/test/java/actions/ViewAction.java | 2 -
.../struts2/osgi/BundleFreemarkerManager.java | 6 +-
.../struts2/osgi/BundlePackageLoader.java | 6 +-
.../struts2/osgi/DefaultBundleAccessor.java | 9 ++-
.../struts2/osgi/OsgiConfigurationProvider.java | 22 +++---
.../java/org/apache/struts2/osgi/OsgiUtil.java | 12 ++--
.../apache/struts2/osgi/StrutsOsgiListener.java | 11 ++-
.../apache/struts2/osgi/host/BaseOsgiHost.java | 50 ++++++-------
.../apache/struts2/osgi/host/FelixOsgiHost.java | 27 +++----
.../struts2/osgi/host/GlassfishOSGiHost.java | 15 ++--
.../osgi/interceptor/OsgiInterceptor.java | 6 +-
.../DefaultOValValidationManager.java | 12 ++--
.../interceptor/OValValidationInterceptor.java | 28 +++-----
.../multipart/PellMultiPartRequest.java | 10 ++-
.../org/apache/struts2/plexus/PlexusFilter.java | 6 +-
.../struts2/plexus/PlexusLifecycleListener.java | 6 +-
.../struts2/plexus/PlexusObjectFactory.java | 6 +-
.../org/apache/struts2/plexus/PlexusUtils.java | 6 +-
.../apache/struts2/StrutsPortletTestCase.java | 6 +-
.../portlet/dispatcher/Jsr168Dispatcher.java | 6 +-
.../portlet/dispatcher/Jsr286Dispatcher.java | 6 +-
.../interceptor/PortletAwareInterceptor.java | 6 +-
.../interceptor/PortletStateInterceptor.java | 6 +-
.../struts2/portlet/result/PortletResult.java | 6 +-
.../portlet/result/PortletVelocityResult.java | 6 +-
.../servlet/PortletServletResponseJSR286.java | 6 +-
.../struts2/portlet/util/PortletUrlHelper.java | 6 +-
.../portlet/util/PortletUrlHelperJSR286.java | 6 +-
.../struts2/rest/RestActionInvocation.java | 6 +-
.../apache/struts2/rest/RestActionMapper.java | 6 +-
.../struts2/rest/RestWorkflowInterceptor.java | 6 +-
.../org/apache/struts2/sitegraph/SiteGraph.java | 6 +-
.../sitegraph/StrutsConfigRetriever.java | 6 +-
.../sitegraph/entities/FileBasedView.java | 6 +-
.../sitemesh/FreemarkerDecoratorServlet.java | 22 ++----
...dDecorator2NewStrutsFreemarkerDecorator.java | 6 +-
...OldDecorator2NewStrutsVelocityDecorator.java | 6 +-
.../struts2/sitemesh/StrutsSiteMeshFactory.java | 6 +-
.../ClassReloadingXMLWebApplicationContext.java | 20 ++----
.../spring/StrutsSpringObjectFactory.java | 6 +-
.../struts2/tiles/StrutsTilesListener.java | 6 +-
.../tiles/StrutsTilesRequestContext.java | 6 +-
pom.xml | 22 +-----
xwork-core/pom.xml | 7 ++
.../opensymphony/xwork2/ActionChainResult.java | 6 +-
.../com/opensymphony/xwork2/ActionSupport.java | 13 ++--
.../xwork2/CompositeTextProvider.java | 6 +-
.../xwork2/DefaultActionInvocation.java | 19 ++---
.../opensymphony/xwork2/DefaultActionProxy.java | 10 ++-
.../xwork2/DefaultLocaleProvider.java | 6 +-
.../com/opensymphony/xwork2/ObjectFactory.java | 13 ++--
.../xwork2/TextProviderSupport.java | 6 +-
.../xwork2/XWorkJUnit4TestCase.java | 6 +-
.../xwork2/config/ConfigurationManager.java | 28 +++-----
.../xwork2/config/ConfigurationUtil.java | 6 +-
.../xwork2/config/entities/PackageConfig.java | 6 +-
.../xwork2/config/impl/AbstractMatcher.java | 6 +-
.../config/impl/DefaultConfiguration.java | 6 +-
.../config/providers/InterceptorBuilder.java | 20 +++---
.../providers/XmlConfigurationProvider.java | 63 +++++-----------
.../DefaultConversionAnnotationProcessor.java | 18 ++---
.../impl/DefaultConversionFileProcessor.java | 32 +++------
.../DefaultConversionPropertiesProcessor.java | 16 ++---
.../impl/DefaultObjectTypeDeterminer.java | 10 ++-
.../impl/InstantiatingNullHandler.java | 6 +-
.../xwork2/conversion/impl/XWorkConverter.java | 48 +++++--------
.../metadata/ConversionDescription.java | 8 +--
.../xwork2/factory/DefaultConverterFactory.java | 10 ++-
.../xwork2/interceptor/AliasInterceptor.java | 6 +-
.../xwork2/interceptor/ChainingInterceptor.java | 6 +-
.../interceptor/DefaultWorkflowInterceptor.java | 22 ++----
.../ExceptionMappingInterceptor.java | 8 +--
.../xwork2/interceptor/I18nInterceptor.java | 28 ++++----
.../xwork2/interceptor/LoggingInterceptor.java | 6 +-
.../interceptor/MethodFilterInterceptor.java | 6 +-
.../interceptor/ParameterFilterInterceptor.java | 6 +-
.../ParameterRemoverInterceptor.java | 6 +-
.../interceptor/ParametersInterceptor.java | 14 ++--
.../interceptor/PrefixMethodInvocationUtil.java | 10 ++-
.../xwork2/interceptor/PrepareInterceptor.java | 4 +-
.../StaticParametersInterceptor.java | 6 +-
.../xwork2/interceptor/TimerInterceptor.java | 8 +--
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 +-
.../xwork2/ognl/OgnlValueStack.java | 19 +++--
.../xwork2/ognl/SecurityMemberAccess.java | 32 +++------
.../ognl/accessor/CompoundRootAccessor.java | 18 ++---
.../XWorkCollectionPropertyAccessor.java | 6 +-
.../ognl/accessor/XWorkMapPropertyAccessor.java | 6 +-
.../ognl/accessor/XWorkMethodAccessor.java | 12 ++--
.../DefaultAcceptedPatternsChecker.java | 22 ++----
.../DefaultExcludedPatternsChecker.java | 22 ++----
.../xwork2/spring/SpringObjectFactory.java | 6 +-
.../spring/SpringProxyableObjectFactory.java | 6 +-
.../ActionAutowiringInterceptor.java | 6 +-
.../com/opensymphony/xwork2/util/DomHelper.java | 37 +++-------
.../xwork2/util/LocalizedTextUtil.java | 53 ++++++--------
.../opensymphony/xwork2/util/ResolverUtil.java | 6 +-
.../com/opensymphony/xwork2/util/URLUtil.java | 14 ++--
.../com/opensymphony/xwork2/util/XWorkList.java | 6 +-
.../util/classloader/FileResourceStore.java | 12 ++--
.../util/classloader/JarResourceStore.java | 12 ++--
.../util/classloader/ReloadingClassLoader.java | 14 ++--
.../classloader/ResourceStoreClassLoader.java | 6 +-
.../xwork2/util/finder/DefaultClassFinder.java | 42 +++++------
.../xwork2/util/finder/ResourceFinder.java | 18 ++---
.../opensymphony/xwork2/util/finder/UrlSet.java | 21 +++---
.../xwork2/util/fs/DefaultFileManager.java | 14 ++--
.../util/fs/DefaultFileManagerFactory.java | 26 +++----
.../xwork2/util/fs/JarEntryRevision.java | 15 ++--
.../xwork2/util/logging/Logger.java | 1 +
.../xwork2/util/logging/LoggerFactory.java | 1 +
.../xwork2/util/logging/LoggerUtils.java | 1 +
.../util/logging/commons/CommonsLogger.java | 1 +
.../logging/commons/CommonsLoggerFactory.java | 1 +
.../xwork2/util/logging/jdk/JdkLogger.java | 1 +
.../util/logging/jdk/JdkLoggerFactory.java | 1 +
.../util/logging/log4j2/Log4j2Logger.java | 1 +
.../logging/log4j2/Log4j2LoggerFactory.java | 1 +
.../xwork2/util/logging/slf4j/Slf4jLogger.java | 1 +
.../util/logging/slf4j/Slf4jLoggerFactory.java | 1 +
.../xwork2/util/profiling/UtilTimerStack.java | 6 +-
.../AnnotationActionValidatorManager.java | 6 +-
.../DefaultActionValidatorManager.java | 6 +-
.../validator/DefaultValidatorFactory.java | 8 +--
.../validator/DefaultValidatorFileParser.java | 6 +-
.../validator/DelegatingValidatorContext.java | 8 +--
.../xwork2/validator/ValidationInterceptor.java | 6 +-
.../validators/ExpressionValidator.java | 6 +-
.../validators/RangeValidatorSupport.java | 14 ++--
.../validators/RegexFieldValidator.java | 11 ++-
...ateConversionErrorFieldValidatorSupport.java | 6 +-
.../validator/validators/ValidatorSupport.java | 6 +-
.../opensymphony/xwork2/ActionSupportTest.java | 6 +-
.../xwork2/UnknownHandlerManagerMock.java | 2 -
.../interceptor/TimerInterceptorTest.java | 2 +-
xwork-core/src/test/resources/log4j.properties | 6 --
xwork-core/src/test/resources/log4j2.xml | 13 ++++
318 files changed, 1425 insertions(+), 2030 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b922d5aa/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b922d5aa/pom.xml
----------------------------------------------------------------------