From commits-return-17727-archive-asf-public=cust-asf.ponee.io@struts.apache.org Tue Jan 30 10:47:15 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 0765B18066D for ; Tue, 30 Jan 2018 10:47:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EB412160C42; Tue, 30 Jan 2018 09:47:14 +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 664E5160C53 for ; Tue, 30 Jan 2018 10:47:14 +0100 (CET) Received: (qmail 4743 invoked by uid 500); 30 Jan 2018 09:47:13 -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 4734 invoked by uid 99); 30 Jan 2018 09:47:13 -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; Tue, 30 Jan 2018 09:47:13 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 19BAF8205D; Tue, 30 Jan 2018 09:47:12 +0000 (UTC) Date: Tue, 30 Jan 2018 09:47:12 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: Merge pull request #206 from lukaszlenart/scan-deeper MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: yasserzamani@apache.org In-Reply-To: <151730563184.14387.10321237227024231815@gitbox.apache.org> References: <151730563184.14387.10321237227024231815@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: 9b892cc7fd86b3d0be55f21d63d4dd455612a1bb X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180130094712.19BAF8205D@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 9b892cc7fd86b3d0be55f21d63d4dd455612a1bb Merge: 97012c7 7446083 Author: Yasser Zamani AuthorDate: Tue Jan 30 13:17:09 2018 +0330 Merge pull request #206 from lukaszlenart/scan-deeper WW-4912: scan package-info and class at the same time .../opensymphony/xwork2/util/AnnotationUtils.java | 37 +++++++++++++++++++++- .../xwork2/util/AnnotationUtilsTest.java | 34 +++++++++++++++++--- .../{MyAnnotation2.java => Dummy3Class.java} | 7 ++-- .../xwork2/util/annotation/DummyClass.java | 4 ++- .../xwork2/util/annotation/MyAnnotation2.java | 2 ++ .../AbstractAbstractDummyAction.java} | 9 +++--- .../AbstractDummyAction.java} | 8 ++--- .../Package2DummyInterface.java} | 9 +++--- .../{MyAnnotation2.java => pkg2/package-info.java} | 9 ++---- .../PackageBasedActionConfigBuilder.java | 15 ++++----- .../PackageBasedActionConfigBuilderTest.java | 6 +++- 11 files changed, 99 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact yasserzamani@apache.org.