Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0853318B06 for ; Thu, 11 Jun 2015 19:16:52 +0000 (UTC) Received: (qmail 58007 invoked by uid 500); 11 Jun 2015 19:16:39 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 57908 invoked by uid 500); 11 Jun 2015 19:16:39 -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 57414 invoked by uid 99); 11 Jun 2015 19:16:39 -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; Thu, 11 Jun 2015 19:16:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78D42E05DD; Thu, 11 Jun 2015 19:16:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jogep@apache.org To: commits@struts.apache.org Date: Thu, 11 Jun 2015 19:17:15 -0000 Message-Id: In-Reply-To: <313deeaf0a3943d5bd3d59b3d025953e@git.apache.org> References: <313deeaf0a3943d5bd3d59b3d025953e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] struts-examples git commit: Merge branch 'master' of ../struts Merge branch 'master' of ../struts Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/585038a9 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/585038a9 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/585038a9 Branch: refs/heads/master Commit: 585038a9a3f86cbab6a158281cb99c8f87f87563 Parents: 1b1c61e 58fcb43 Author: Johannes Geppert Authored: Thu Jun 11 20:51:20 2015 +0200 Committer: Johannes Geppert Committed: Thu Jun 11 20:51:20 2015 +0200 ---------------------------------------------------------------------- jboss-blank/README.txt | 16 ++ jboss-blank/pom.xml | 69 ++++++++ .../src/main/java/example/ExampleSupport.java | 30 ++++ .../src/main/java/example/HelloWorld.java | 61 +++++++ jboss-blank/src/main/java/example/Login.java | 59 +++++++ jboss-blank/src/main/resources/LICENSE.txt | 174 +++++++++++++++++++ jboss-blank/src/main/resources/NOTICE.txt | 5 + jboss-blank/src/main/resources/example.xml | 25 +++ .../main/resources/example/Login-validation.xml | 16 ++ .../main/resources/example/package.properties | 5 + .../resources/example/package_es.properties | 5 + jboss-blank/src/main/resources/log4j2.xml | 15 ++ jboss-blank/src/main/resources/struts.xml | 27 +++ .../src/main/resources/velocity.properties | 1 + .../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 28 +++ .../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 ++ .../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 + .../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 ++ .../webapp/WEB-INF/jsp/example/Register.jsp | 3 + .../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 ++ jboss-blank/src/main/webapp/WEB-INF/web.xml | 37 ++++ jboss-blank/src/main/webapp/index.html | 10 ++ .../src/test/java/example/ConfigTest.java | 96 ++++++++++ .../src/test/java/example/HelloWorldTest.java | 37 ++++ .../src/test/java/example/LoginTest.java | 55 ++++++ 25 files changed, 821 insertions(+) ----------------------------------------------------------------------