Repository: struts
Updated Branches:
refs/heads/feature/move-jsps-under-webinf c0a312a82 -> d0c90dda9
Updates configuration and replaces jsp with action
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d0c90dda
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d0c90dda
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d0c90dda
Branch: refs/heads/feature/move-jsps-under-webinf
Commit: d0c90dda952ccd4539c6ecd912bce7a0f97aa014
Parents: c0a312a
Author: Lukasz Lenart
Authored: Mon Mar 3 21:52:54 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Mar 3 21:52:54 2014 +0100
--
.../showcase/src/main/resources/struts-ajax.xml | 27 +++
.../src/main/resources/struts-conversion.xml| 4 ++
.../src/main/resources/struts-filedownload.xml | 4 ++
.../src/main/resources/struts-integration.xml | 2 +-
.../src/main/resources/struts-interactive.xml | 5 ++
apps/showcase/src/main/resources/struts-jsf.xml | 4 ++
.../src/main/resources/struts-tags-non-ui.xml | 3 ++
.../src/main/resources/struts-tags-ui.xml | 16 +++
.../src/main/resources/struts-validation.xml| 7 +++
.../showcase/src/main/resources/struts-wait.xml | 12 +
apps/showcase/src/main/resources/struts.xml | 23 +-
.../webapp/WEB-INF/ajax/autocompleter/index.jsp | 28
.../main/webapp/WEB-INF/ajax/commonInclude.jsp | 2 +-
.../src/main/webapp/WEB-INF/ajax/footer.jsp | 2 +-
.../src/main/webapp/WEB-INF/ajax/index.jsp | 24 --
.../customTheme/ftlCustomTemplate.ftl | 7 ---
.../customTheme/jspCustomTemplate.jsp | 8
.../src/main/webapp/WEB-INF/decorators/main.jsp | 34 +++---
.../main/webapp/WEB-INF/empmanager/index.jsp| 1 -
.../src/main/webapp/WEB-INF/person/index.jsp| 1 -
.../WEB-INF/template/xhtml/mytemplate.jsp | 9
apps/showcase/src/main/webapp/WEB-INF/tiles.xml | 18
.../main/webapp/WEB-INF/token/doublePost.jsp| 2 +-
.../src/main/webapp/WEB-INF/token/index.jsp | 48
.../main/webapp/WEB-INF/token/transferDone.jsp | 2 +-
.../main/webapp/WEB-INF/validation/index.jsp| 2 +-
.../src/main/webapp/WEB-INF/wait/complete.jsp | 2 +-
.../src/main/webapp/WEB-INF/wait/index.jsp | 34 --
.../src/main/webapp/WEB-INF/wait/wait.jsp | 2 +-
apps/showcase/src/main/webapp/ajax/index.html | 24 ++
.../customTheme/ftlCustomTemplate.ftl | 7 +++
.../customTheme/jspCustomTemplate.jsp | 8
apps/showcase/src/main/webapp/person/index.html | 10
apps/showcase/src/main/webapp/skill/index.html | 10
.../main/webapp/template/xhtml/mytemplate.jsp | 9
apps/showcase/src/main/webapp/token/index.html | 47 +++
apps/showcase/src/main/webapp/wait/index.html | 33 ++
37 files changed, 294 insertions(+), 187 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d0c90dda/apps/showcase/src/main/resources/struts-ajax.xml
--
diff --git a/apps/showcase/src/main/resources/struts-ajax.xml
b/apps/showcase/src/main/resources/struts-ajax.xml
index 43d0876..a5ce83c 100644
--- a/apps/showcase/src/main/resources/struts-ajax.xml
+++ b/apps/showcase/src/main/resources/struts-ajax.xml
@@ -54,6 +54,33 @@
/WEB-INF/ajax/tabbedpanel/example5Ok.jsp
+
+
+
+/WEB-INF/ajax/bind/index.jsp
+
+
+/WEB-INF/ajax/autocompleter/index.jsp
+
+
+/WEB-INF/ajax/remotebutton/index.jsp
+
+
+/WEB-INF/ajax/remotediv/index.jsp
+
+
+/WEB-INF/ajax/remotelink/index.jsp
+
+
+/WEB-INF/ajax/tabbedpanel/index.jsp
+
+
+/WEB-INF/ajax/remoteforms/index.jsp
+
+
+/WEB-INF/ajax/widgets/index.jsp
+
+
http://git-wip-us.apache.org/repos/asf/struts/blob/d0c90dda/apps/showcase/src/main/resources/struts-conversion.xml
--
diff --git a/apps/showcase/src/main/resources/struts-conversion.xml
b/apps/showcase/src/main/resources/struts-conversion.xml
index 27dd687..cfbac4a 100644
--- a/apps/showcase/src/main/resources/struts-conversion.xml
+++ b/apps/showcase/src/main/resources/struts-conversion.xml
@@ -6,6 +6,10 @@
+
+/WEB-INF/conversion/index.jsp
+
+
http://git-wip-us.apache.org/repos/asf/struts/blob/d0c90dda/apps/showcase/src/main/resources/struts-filedownload.xml
