You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/04/14 22:39:44 UTC
[3/3] git commit: Merge branch 'feature/move-jsps-under-webinf' into
develop
Merge branch 'feature/move-jsps-under-webinf' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/54c9efc5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/54c9efc5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/54c9efc5
Branch: refs/heads/develop
Commit: 54c9efc51b30bbd2f529ffa4c74cd96965b8a6d0
Parents: 90eb79a 0b510ca
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 14 22:39:29 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 14 22:39:29 2014 +0200
----------------------------------------------------------------------
.../src/main/resources/example.xml | 6 ++---
.../main/webapp/WEB-INF/example/HelloWorld.jsp | 28 ++++++++++++++++++++
.../src/main/webapp/WEB-INF/example/Login.jsp | 15 +++++++++++
.../src/main/webapp/WEB-INF/example/Menu.jsp | 3 +++
.../src/main/webapp/WEB-INF/example/Missing.jsp | 11 ++++++++
.../main/webapp/WEB-INF/example/Register.jsp | 3 +++
.../src/main/webapp/WEB-INF/example/Welcome.jsp | 18 +++++++++++++
.../src/main/webapp/example/HelloWorld.jsp | 28 --------------------
.../src/main/webapp/example/Login.jsp | 15 -----------
.../src/main/webapp/example/Menu.jsp | 3 ---
.../src/main/webapp/example/Missing.jsp | 11 --------
.../src/main/webapp/example/Register.jsp | 3 ---
.../src/main/webapp/example/Welcome.jsp | 18 -------------
.../src/main/resources/struts.xml | 4 +--
.../src/main/webapp/WEB-INF/jsp/helloWorld.jsp | 16 +++++++++++
.../src/main/webapp/WEB-INF/jsp/index.jsp | 20 ++++++++++++++
.../src/main/webapp/jsp/helloWorld.jsp | 16 -----------
.../src/main/webapp/jsp/index.jsp | 20 --------------
18 files changed, 119 insertions(+), 119 deletions(-)
----------------------------------------------------------------------