This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4ce603b484a5092d58d7ff3d77262953be7d2843 Merge: 47e94a1 15a6942 Author: Lukasz Lenart <lukasz.len...@gmail.com> AuthorDate: Fri Oct 6 07:56:31 2017 +0200 Merge pull request #168 from lukaszlenart/initializable WW-4849: Initializable interface Closes #165 .../com/opensymphony/xwork2/ObjectFactory.java | 7 +++- .../conversion/ConversionPropertiesProcessor.java | 4 +- .../impl/DefaultConversionPropertiesProcessor.java | 7 ++++ .../xwork2/conversion/impl/XWorkConverter.java | 6 --- .../xwork2/inject/ContainerBuilder.java | 45 ++++++++++++++++------ .../Initializable.java} | 25 ++++++------ .../xwork2/spring/SpringObjectFactory.java | 8 ++-- .../spring/SpringProxyableObjectFactory.java | 7 +--- .../interceptor/ActionAutowiringInterceptor.java | 3 +- .../opensymphony/xwork2/ProxyObjectFactory.java | 7 +--- .../ScopedModelDrivenInterceptorTest.java | 4 +- .../apache/struts2/dispatcher/DispatcherTest.java | 8 ++-- .../org/apache/struts2/cdi/CdiObjectFactory.java | 5 +-- .../apache/struts2/cdi/CdiObjectFactoryTest.java | 6 +-- .../PackageBasedActionConfigBuilderTest.java | 7 +++- .../struts2/osgi/DelegatingObjectFactory.java | 4 +- .../struts2/osgi/SpringOsgiObjectFactory.java | 5 +-- .../apache/struts2/plexus/PlexusObjectFactory.java | 5 +-- .../struts2/spring/StrutsSpringObjectFactory.java | 6 ++- 19 files changed, 90 insertions(+), 79 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@struts.apache.org" <commits@struts.apache.org>.