Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/48ea26be Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/48ea26be Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/48ea26be Branch: refs/heads/master Commit: 48ea26be79bc54286ce50ec72aa6c53fee17b1bf Parents: db62a57 43c0309 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Sep 28 20:42:36 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Sep 28 20:42:36 2015 +0200 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 14 ++----- .../main/java/actions/ApplicationAction.java | 44 -------------------- .../src/main/java/actions/Index.java | 26 +++++------- .../main/java/actions/data/ProjectsAction.java | 2 - .../main/java/actions/data/package-info.java | 24 +++++++++++ .../src/main/resources/struts.xml | 4 +- .../main/webapp/WEB-INF/content/application.jsp | 38 ----------------- .../src/main/webapp/WEB-INF/content/index.jsp | 38 +++++++++++++++++ .../src/main/webapp/index.jsp | 2 +- .../java/actions/ApplicationActionTest.java | 32 -------------- .../src/test/java/actions/IndexTest.java | 13 +++--- .../src/main/resources/struts-plugin.xml | 41 ++++++++++++++++++ .../rest/src/main/resources/struts-plugin.xml | 4 +- 13 files changed, 131 insertions(+), 151 deletions(-) ----------------------------------------------------------------------
