Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EA189200CCC for ; Fri, 7 Jul 2017 08:15:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E8C26167AE8; Fri, 7 Jul 2017 06:15:15 +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 4477F167A9A for ; Fri, 7 Jul 2017 08:15:15 +0200 (CEST) Received: (qmail 52066 invoked by uid 500); 7 Jul 2017 06:15:14 -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 51712 invoked by uid 99); 7 Jul 2017 06:15:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jul 2017 06:15:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52D8DE964E; Fri, 7 Jul 2017 06:15:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 07 Jul 2017 06:15:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] struts-examples git commit: Merge branch 'shiro' archived-at: Fri, 07 Jul 2017 06:15:16 -0000 Merge branch 'shiro' Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/dece3f95 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/dece3f95 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/dece3f95 Branch: refs/heads/master Commit: dece3f9550686539de50157a3b79a7ea8aa1f57f Parents: 9f8e559 ee5a3e3 Author: Lukasz Lenart Authored: Fri Jul 7 08:13:01 2017 +0200 Committer: Lukasz Lenart Committed: Fri Jul 7 08:13:01 2017 +0200 ---------------------------------------------------------------------- pom.xml | 1 + shiro-basic/pom.xml | 67 +++++++++++ .../shiro/example/action/LoginAction.java | 116 +++++++++++++++++++ .../shiro/example/action/LogoutAction.java | 18 +++ .../shiro/example/action/ShiroBaseAction.java | 28 +++++ .../shiro/example/action/WelcomeAction.java | 107 +++++++++++++++++ .../interceptor/ShiroUserInterceptor.java | 57 +++++++++ shiro-basic/src/main/resources/log4j2.xml | 25 ++++ shiro-basic/src/main/resources/shiro.ini | 25 ++++ shiro-basic/src/main/resources/struts.xml | 37 ++++++ shiro-basic/src/main/webapp/WEB-INF/web.xml | 27 +++++ shiro-basic/src/main/webapp/css/main.css | 56 +++++++++ shiro-basic/src/main/webapp/index.jsp | 1 + shiro-basic/src/main/webapp/pages/login.jsp | 27 +++++ shiro-basic/src/main/webapp/pages/welcome.jsp | 39 +++++++ 15 files changed, 631 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/dece3f95/pom.xml ----------------------------------------------------------------------