From commits-return-17679-archive-asf-public=cust-asf.ponee.io@struts.apache.org Wed Jan 10 09:39:20 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 4171C18062E for ; Wed, 10 Jan 2018 09:39:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 31B84160C23; Wed, 10 Jan 2018 08:39:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 775BD160C2E for ; Wed, 10 Jan 2018 09:39:19 +0100 (CET) Received: (qmail 27448 invoked by uid 500); 10 Jan 2018 08:39:18 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 27432 invoked by uid 99); 10 Jan 2018 08:39:18 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jan 2018 08:39:18 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 462A881C3B; Wed, 10 Jan 2018 08:39:17 +0000 (UTC) Date: Wed, 10 Jan 2018 08:39:18 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: Merge pull request #196 from lukaszlenart/init-like-a-boss MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: yasserzamani@apache.org In-Reply-To: <151557355697.1673.3988134147451686214@gitbox.apache.org> References: <151557355697.1673.3988134147451686214@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 29b29a9c64aa4700b0f3c52f250ef27a9dc67516 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180110083917.462A881C3B@gitbox.apache.org> 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 29b29a9c64aa4700b0f3c52f250ef27a9dc67516 Merge: a66f92c 5e237e0 Author: Yasser Zamani AuthorDate: Wed Jan 10 12:09:14 2018 +0330 Merge pull request #196 from lukaszlenart/init-like-a-boss WW-4905: Allows Initializable interface on implementing class instead of interface core/pom.xml | 1 - .../opensymphony/xwork2/XWorkJUnit4TestCase.java | 4 + .../com/opensymphony/xwork2/XWorkTestCase.java | 6 +- .../xwork2/config/impl/DefaultConfiguration.java | 5 + .../config/impl/LocatableConstantFactory.java | 7 +- .../xwork2/config/impl/LocatableFactory.java | 5 + .../providers/XWorkConfigurationProvider.java | 1 + .../conversion/ConversionPropertiesProcessor.java | 4 +- .../impl/DefaultConversionPropertiesProcessor.java | 4 +- .../xwork2/inject/ContainerBuilder.java | 54 ++++++++-- .../opensymphony/xwork2/inject/ContainerImpl.java | 7 +- ...nternalFactory.java => EarlyInitializable.java} | 23 +--- .../com/opensymphony/xwork2/inject/Factory.java | 27 +++-- .../xwork2/inject/InitializableFactory.java | 56 ++++++++++ .../xwork2/inject/InternalFactory.java | 25 +++-- .../java/com/opensymphony/xwork2/inject/Scope.java | 33 +++++- .../xwork2/validator/DefaultValidatorFactory.java | 3 +- .../xwork2/validator/ValidatorFactory.java | 4 +- .../config/AbstractBeanSelectionProvider.java | 5 + .../config/StrutsXmlConfigurationProvider.java | 3 + .../factory/PrefixBasedActionProxyFactory.java | 31 +++--- .../xwork2/config/ConfigurationManagerTest.java | 7 ++ .../xwork2/inject/ContainerImplTest.java | 120 ++++++++++++++++++--- .../xwork2/inject/EarlyInitializableBean.java} | 32 +++--- .../xwork2/inject/InitializableBean.java} | 32 +++--- .../xwork2/ognl/SetPropertiesTest.java | 12 ++- .../validator/SimpleActionValidationTest.java | 6 ++ .../factory/PrefixBasedActionProxyFactoryTest.java | 19 +++- 28 files changed, 393 insertions(+), 143 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@struts.apache.org" .