From 6b00db2d23acf93f83563715aa0deaeb0a245785 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 25 Feb 2014 10:56:53 +0100 Subject: [PATCH 1/8] Moves jsps under WEB-INF --- .../src/main/resources/example.xml | 6 +- .../{ => WEB-INF/jsp}/example/HelloWorld.jsp | 56 +++++++++---------- .../{ => WEB-INF/jsp}/example/Login.jsp | 30 +++++----- .../webapp/{ => WEB-INF/jsp}/example/Menu.jsp | 4 +- .../{ => WEB-INF/jsp}/example/Missing.jsp | 22 ++++---- .../{ => WEB-INF/jsp}/example/Register.jsp | 4 +- .../{ => WEB-INF/jsp}/example/Welcome.jsp | 36 ++++++------ 7 files changed, 79 insertions(+), 79 deletions(-) rename apps/jboss-blank/src/main/webapp/{ => WEB-INF/jsp}/example/HelloWorld.jsp (95%) rename apps/jboss-blank/src/main/webapp/{ => WEB-INF/jsp}/example/Login.jsp (95%) rename apps/jboss-blank/src/main/webapp/{ => WEB-INF/jsp}/example/Menu.jsp (73%) rename apps/jboss-blank/src/main/webapp/{ => WEB-INF/jsp}/example/Missing.jsp (95%) rename apps/jboss-blank/src/main/webapp/{ => WEB-INF/jsp}/example/Register.jsp (73%) rename apps/jboss-blank/src/main/webapp/{ => WEB-INF/jsp}/example/Welcome.jsp (95%) diff --git a/apps/jboss-blank/src/main/resources/example.xml b/apps/jboss-blank/src/main/resources/example.xml index e93d84e7b..d929de1c8 100644 --- a/apps/jboss-blank/src/main/resources/example.xml +++ b/apps/jboss-blank/src/main/resources/example.xml @@ -8,16 +8,16 @@ - /example/HelloWorld.jsp + /WEB-INF/jsp/example/HelloWorld.jsp - /example/Login.jsp + /WEB-INF/jsp/example/Login.jsp Menu - /example/{1}.jsp + /WEB-INF/jsp/example/{1}.jsp diff --git a/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp similarity index 95% rename from apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp rename to apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp index 5ca640283..938c76132 100644 --- a/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp @@ -1,28 +1,28 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - - - <s:text name="HelloWorld.message"/> - - - -

- -

Languages

- - - - +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + + <s:text name="HelloWorld.message"/> + + + +

+ +

Languages

+ + + + diff --git a/apps/jboss-blank/src/main/webapp/example/Login.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp similarity index 95% rename from apps/jboss-blank/src/main/webapp/example/Login.jsp rename to apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp index 2b77ac2bf..6438080a3 100644 --- a/apps/jboss-blank/src/main/webapp/example/Login.jsp +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp @@ -1,15 +1,15 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - - - Sign On - - - - - - - - - - +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + + Sign On + + + + + + + + + + diff --git a/apps/jboss-blank/src/main/webapp/example/Menu.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp similarity index 73% rename from apps/jboss-blank/src/main/webapp/example/Menu.jsp rename to apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp index 3fbc54be9..a74bd2c76 100644 --- a/apps/jboss-blank/src/main/webapp/example/Menu.jsp +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp @@ -1,3 +1,3 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> \ No newline at end of file diff --git a/apps/jboss-blank/src/main/webapp/example/Missing.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp similarity index 95% rename from apps/jboss-blank/src/main/webapp/example/Missing.jsp rename to apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp index d2f002301..7c01ac9be 100644 --- a/apps/jboss-blank/src/main/webapp/example/Missing.jsp +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp @@ -1,11 +1,11 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -Missing Feature - - -

- -

- - +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +Missing Feature + + +

+ +

+ + diff --git a/apps/jboss-blank/src/main/webapp/example/Register.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp similarity index 73% rename from apps/jboss-blank/src/main/webapp/example/Register.jsp rename to apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp index 3fbc54be9..a74bd2c76 100644 --- a/apps/jboss-blank/src/main/webapp/example/Register.jsp +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp @@ -1,3 +1,3 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> \ No newline at end of file diff --git a/apps/jboss-blank/src/main/webapp/example/Welcome.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp similarity index 95% rename from apps/jboss-blank/src/main/webapp/example/Welcome.jsp rename to apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp index 23ae4b862..64ffe9b10 100644 --- a/apps/jboss-blank/src/main/webapp/example/Welcome.jsp +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp @@ -1,18 +1,18 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - - - Welcome - " rel="stylesheet" - type="text/css"/> - - - -

Commands

- - - - +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + + Welcome + " rel="stylesheet" + type="text/css"/> + + + +

Commands

+ + + + From 6f43464fcaab59e7345a3e394db4a969cf410d15 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 25 Feb 2014 10:57:21 +0100 Subject: [PATCH 2/8] Adds security constraints to block access to jsp files --- .../src/main/webapp/WEB-INF/web.xml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml index 490247991..88c6fc8e5 100644 --- a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml @@ -17,4 +17,24 @@ index.html + + + No direct JSP access + + No-JSP + *.jsp + + + no-users + + + NONE + + + + + Don't assign users to this role + no-users + + From 95b309a9b93eebadb589a335947598d815add80b Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 2 Mar 2014 21:13:38 +0100 Subject: [PATCH 3/8] Adds security constraints to web.xml to block access to pure JSP files --- apps/blank/src/main/webapp/WEB-INF/web.xml | 5 +++++ .../jboss-blank/src/main/webapp/WEB-INF/web.xml | 3 --- apps/mailreader/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++ apps/portlet/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++ apps/showcase/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++ 6 files changed, 73 insertions(+), 3 deletions(-) diff --git a/apps/blank/src/main/webapp/WEB-INF/web.xml b/apps/blank/src/main/webapp/WEB-INF/web.xml index e8c0f4654..f15252bb9 100644 --- a/apps/blank/src/main/webapp/WEB-INF/web.xml +++ b/apps/blank/src/main/webapp/WEB-INF/web.xml @@ -31,4 +31,9 @@ + + Don't assign users to this role + no-users + + diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml index 88c6fc8e5..d1cf0209c 100644 --- a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml +++ b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml @@ -27,9 +27,6 @@ no-users - - NONE - diff --git a/apps/mailreader/src/main/webapp/WEB-INF/web.xml b/apps/mailreader/src/main/webapp/WEB-INF/web.xml index 9b35ec3ef..b01d86447 100644 --- a/apps/mailreader/src/main/webapp/WEB-INF/web.xml +++ b/apps/mailreader/src/main/webapp/WEB-INF/web.xml @@ -27,4 +27,21 @@ index.html + + + No direct JSP access + + No-JSP + *.jsp + + + no-users + + + + + Don't assign users to this role + no-users + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/web.xml b/apps/portlet/src/main/webapp/WEB-INF/web.xml index f42441989..d4a3c79ff 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/web.xml +++ b/apps/portlet/src/main/webapp/WEB-INF/web.xml @@ -28,4 +28,21 @@ + + + No direct JSP access + + No-JSP + *.jsp + + + no-users + + + + + Don't assign users to this role + no-users + + diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml b/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml index d10c214cc..694c349c2 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml @@ -26,4 +26,21 @@ index.jsp + + + No direct JSP access + + No-JSP + *.jsp + + + no-users + + + + + Don't assign users to this role + no-users + + diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml index 62335a4af..f3b88e916 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/web.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml @@ -194,4 +194,21 @@ index.html + + + No direct JSP access + + No-JSP + *.jsp + + + no-users + + + + + Don't assign users to this role + no-users + + From d07e8044beef98222f0140adb0b4e2892b6bf166 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 2 Mar 2014 21:17:30 +0100 Subject: [PATCH 4/8] Moves mailreader related JSPs under WEB-INF --- apps/mailreader/src/main/java/mailreader-support.xml | 10 +++++----- .../main/webapp/{ => WEB-INF/jsp}/ChangePassword.jsp | 0 .../src/main/webapp/{ => WEB-INF/jsp}/Error.jsp | 0 .../src/main/webapp/{ => WEB-INF/jsp}/Footer.jsp | 0 .../src/main/webapp/{ => WEB-INF/jsp}/Login.jsp | 0 .../src/main/webapp/{ => WEB-INF/jsp}/MainMenu.jsp | 0 .../src/main/webapp/{ => WEB-INF/jsp}/Registration.jsp | 0 .../src/main/webapp/{ => WEB-INF/jsp}/Subscription.jsp | 0 .../src/main/webapp/{ => WEB-INF/jsp}/Welcome.jsp | 0 9 files changed, 5 insertions(+), 5 deletions(-) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/ChangePassword.jsp (100%) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Error.jsp (100%) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Footer.jsp (100%) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Login.jsp (100%) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/MainMenu.jsp (100%) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Registration.jsp (100%) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Subscription.jsp (100%) rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Welcome.jsp (100%) diff --git a/apps/mailreader/src/main/java/mailreader-support.xml b/apps/mailreader/src/main/java/mailreader-support.xml index a6995431e..2438cb4a7 100644 --- a/apps/mailreader/src/main/java/mailreader-support.xml +++ b/apps/mailreader/src/main/java/mailreader-support.xml @@ -12,7 +12,7 @@ - /Welcome.jsp + /WEB-INF/jsp/Welcome.jsp @@ -21,7 +21,7 @@ - /Login.jsp + /WEB-INF/jsp/Login.jsp Welcome MainMenu ChangePassword @@ -32,7 +32,7 @@ - /Registration.jsp + /WEB-INF/jsp/Registration.jsp MainMenu @@ -41,7 +41,7 @@ - /Subscription.jsp + /WEB-INF/jsp/Subscription.jsp Registration_input @@ -56,7 +56,7 @@ - /{1}.jsp + /WEB-INF/jsp/{1}.jsp diff --git a/apps/mailreader/src/main/webapp/ChangePassword.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/ChangePassword.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp diff --git a/apps/mailreader/src/main/webapp/Error.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/Error.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp diff --git a/apps/mailreader/src/main/webapp/Footer.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/Footer.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp diff --git a/apps/mailreader/src/main/webapp/Login.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/Login.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp diff --git a/apps/mailreader/src/main/webapp/MainMenu.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/MainMenu.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp diff --git a/apps/mailreader/src/main/webapp/Registration.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/Registration.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp diff --git a/apps/mailreader/src/main/webapp/Subscription.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/Subscription.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp diff --git a/apps/mailreader/src/main/webapp/Welcome.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp similarity index 100% rename from apps/mailreader/src/main/webapp/Welcome.jsp rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp From 65eb97514c635da87c60f2a7b0d6bbbdd79358ee Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 2 Mar 2014 22:02:49 +0100 Subject: [PATCH 5/8] Moves showcase related JSPs under WEB-INF --- .../main/resources/struts-actionchaining.xml | 2 +- .../src/main/resources/struts-ajax.xml | 42 +++++++------- .../src/main/resources/struts-chat.xml | 28 ++++----- .../src/main/resources/struts-conversion.xml | 40 ++++++------- .../src/main/resources/struts-fileupload.xml | 14 ++--- .../src/main/resources/struts-freemarker.xml | 4 +- .../src/main/resources/struts-hangman.xml | 18 +++--- .../src/main/resources/struts-integration.xml | 4 +- .../src/main/resources/struts-interactive.xml | 2 +- .../main/resources/struts-model-driven.xml | 4 +- .../src/main/resources/struts-tags-non-ui.xml | 54 +++++++++--------- .../src/main/resources/struts-tags-ui.xml | 42 +++++++------- .../src/main/resources/struts-tiles.xml | 2 +- .../src/main/resources/struts-token.xml | 24 ++++---- .../src/main/resources/struts-validation.xml | 30 +++++----- .../src/main/resources/struts-wait.xml | 12 ++-- apps/showcase/src/main/resources/struts.xml | 6 +- .../actionchaining/actionChainingResult.jsp | 0 .../webapp/{ => WEB-INF}/ajax/AjaxResult.jsp | 0 .../webapp/{ => WEB-INF}/ajax/AjaxResult2.js | 0 .../webapp/{ => WEB-INF}/ajax/AjaxResult3.jsp | 0 .../ajax/autocompleter/index.jsp | 2 +- .../webapp/{ => WEB-INF}/ajax/bind/index.jsp | 2 +- .../{ => WEB-INF}/ajax/commonInclude.jsp | 0 .../main/webapp/{ => WEB-INF}/ajax/footer.jsp | 2 +- .../main/webapp/{ => WEB-INF}/ajax/index.jsp | 0 .../webapp/{ => WEB-INF}/ajax/options.ftl | 0 .../{ => WEB-INF}/ajax/remotebutton/index.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example1.jsp | 2 +- .../ajax/remotediv/example10.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example2.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example3.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example4.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example5.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example6.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example7.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example8.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/example9.jsp | 2 +- .../{ => WEB-INF}/ajax/remotediv/index.jsp | 2 +- .../{ => WEB-INF}/ajax/remoteforms/index.jsp | 0 .../{ => WEB-INF}/ajax/remotelink/index.jsp | 2 +- .../ajax/tabbedpanel/example1.jsp | 2 +- .../ajax/tabbedpanel/example2.jsp | 2 +- .../ajax/tabbedpanel/example3.jsp | 2 +- .../ajax/tabbedpanel/example4.jsp | 2 +- .../ajax/tabbedpanel/example5.jsp | 2 +- .../ajax/tabbedpanel/example5Ok.jsp | 0 .../ajax/tabbedpanel/example6.jsp | 2 +- .../{ => WEB-INF}/ajax/tabbedpanel/index.jsp | 2 +- .../ajax/tabbedpanel/nodecorate/panel1.ftl | 0 .../ajax/tabbedpanel/nodecorate/panel2.ftl | 0 .../tabbedpanel/nodecorate/panel2Submit.ftl | 0 .../ajax/tabbedpanel/nodecorate/panel3.ftl | 0 .../tabbedpanel/nodecorate/panel3Submit.ftl | 0 .../main/webapp/{ => WEB-INF}/ajax/testjs.jsp | 0 .../{ => WEB-INF}/ajax/tree/getCategory.jsp | 0 .../ajax/tree/partialChunkHeader.jsp | 0 .../webapp/{ => WEB-INF}/ajax/tree/toggle.jsp | 0 .../webapp/{ => WEB-INF}/ajax/tree/tree.jsp | 0 .../{ => WEB-INF}/ajax/widgets/index.jsp | 2 +- .../webapp/{ => WEB-INF}/chat/chatLogin.ftl | 0 .../webapp/{ => WEB-INF}/chat/createRoom.ftl | 0 .../main/webapp/{ => WEB-INF}/chat/index.jsp | 0 .../chat/messagesAvailableInRoom.ftl | 0 .../{ => WEB-INF}/chat/roomSelection.ftl | 0 .../{ => WEB-INF}/chat/roomsAvailable.ftl | 0 .../chat/sendMessageToRoomResult.ftl | 0 .../webapp/{ => WEB-INF}/chat/showRoom.ftl | 0 .../{ => WEB-INF}/chat/usersAvailable.ftl | 0 .../chat/usersAvailableInRoom.ftl | 0 .../{ => WEB-INF}/conversion/Address.java.txt | 0 .../conversion/AddressAction.java.txt | 0 .../conversion/EnumTypeConverter.java.txt | 0 .../conversion/OperationsEnum.java.txt | 0 .../conversion/OperationsEnumAction.java.txt | 0 .../OperationsEnumActionConversion.txt | 0 .../{ => WEB-INF}/conversion/Person.java.txt | 0 .../conversion/PersonAction.java.txt | 0 .../conversion/enterAddressInfo.jsp | 0 .../conversion/enterOperations.jsp | 0 .../conversion/enterPersonInfo.jsp | 0 .../webapp/{ => WEB-INF}/conversion/index.jsp | 0 .../conversion/showAddressInfo.jsp | 0 .../conversion/showOperations.jsp | 0 .../conversion/showPersonInfo.jsp | 0 .../customTheme/ftlCustomTemplate.ftl | 0 .../customTheme/jspCustomTemplate.jsp | 0 .../src/main/webapp/{ => WEB-INF}/date.jsp | 0 .../{ => WEB-INF}/empmanager/editEmployee.jsp | 0 .../{ => WEB-INF}/empmanager/editSkill.jsp | 0 .../webapp/{ => WEB-INF}/empmanager/index.jsp | 0 .../empmanager/listEmployees.jsp | 0 .../{ => WEB-INF}/empmanager/listSkills.jsp | 0 .../{ => WEB-INF}/filedownload/index.jsp | 0 .../fileupload/multipleUploadUsingArray.jsp | 0 .../fileupload/multipleUploadUsingList.jsp | 0 .../fileupload/upload-success.jsp | 0 .../{ => WEB-INF}/fileupload/upload.jsp | 0 .../customFreemarkerManagerUsage.ftl | 0 .../webapp/{ => WEB-INF}/freemarker/index.jsp | 0 .../{ => WEB-INF}/freemarker/standardTags.ftl | 0 .../webapp/{ => WEB-INF}/hangman/blank.ftl | 0 .../{ => WEB-INF}/hangman/hangmanAjax.ftl | 0 .../{ => WEB-INF}/hangman/hangmanNonAjax.ftl | 0 .../hangman/updateCharacterAvailable.ftl | 0 .../{ => WEB-INF}/hangman/updateGuessLeft.ftl | 0 .../{ => WEB-INF}/hangman/updateScaffold.ftl | 0 .../hangman/updateVocabCharacters.ftl | 0 .../src/main/webapp/{ => WEB-INF}/help.jsp | 0 .../{ => WEB-INF}/integration/modelDriven.jsp | 0 .../integration/modelDrivenResult.jsp | 0 .../webapp/{ => WEB-INF}/interactive/demo.jsp | 0 .../interactive/example-action.jsp | 0 .../{ => WEB-INF}/interactive/index.jsp | 0 .../{ => WEB-INF}/interactive/jsp_0.jsp | 0 .../{ => WEB-INF}/interactive/jsp_1.jsp | 0 .../{ => WEB-INF}/interactive/jsp_2.jsp | 0 .../{ => WEB-INF}/interactive/jsp_3.jsp | 0 .../{ => WEB-INF}/interactive/jsp_4.jsp | 0 .../{ => WEB-INF}/interactive/ognl_0.jsp | 0 .../{ => WEB-INF}/interactive/ognl_1.jsp | 0 .../{ => WEB-INF}/interactive/ognl_2.jsp | 0 .../{ => WEB-INF}/interactive/ognl_3.jsp | 0 .../{ => WEB-INF}/interactive/ognl_4.jsp | 0 .../{ => WEB-INF}/interactive/ognl_5.jsp | 0 .../{ => WEB-INF}/interactive/ognl_6.jsp | 0 .../{ => WEB-INF}/interactive/ognl_7.jsp | 0 .../{ => WEB-INF}/interactive/ognl_8.jsp | 0 .../{ => WEB-INF}/jsf/employee/edit.jsp | 0 .../{ => WEB-INF}/jsf/employee/list.jsp | 0 .../main/webapp/{ => WEB-INF}/jsf/index.jsp | 0 .../{ => WEB-INF}/modelDriven/modelDriven.jsp | 0 .../modelDriven/modelDrivenResult.jsp | 0 .../{ => WEB-INF}/person/edit-person.jsp | 0 .../webapp/{ => WEB-INF}/person/index.jsp | 0 .../{ => WEB-INF}/person/list-people.ftl | 0 .../{ => WEB-INF}/person/new-person.ftl | 0 .../main/webapp/{ => WEB-INF}/showcase.jsp | 0 .../tags/non-ui/actionPrefix/actionPrefix.ftl | 0 .../actionPrefix/actionPrefixExample.ftl | 0 .../tags/non-ui/actionPrefix/methodPrefix.ftl | 0 .../tags/non-ui/actionPrefix/normalSubmit.ftl | 0 .../actionPrefix/redirectActionPrefix.ftl | 0 .../tags/non-ui/actionTag/includedPage.jsp | 0 .../tags/non-ui/actionTag/includedPage2.jsp | 0 .../tags/non-ui/actionTag/includedPage3.jsp | 0 .../non-ui/actionTag/showActionTagDemo.jsp | 0 .../webapp/{ => WEB-INF}/tags/non-ui/date.jsp | 0 .../{ => WEB-INF}/tags/non-ui/debug.jsp | 0 .../tags/non-ui/ifTag/testIf.ftl | 0 .../tags/non-ui/ifTag/testIf.jsp | 0 .../appendIteratorTagDemoResult.jsp | 0 .../iteratorGeneratorTagDemoResult.jsp | 0 .../mergeIteratorTagDemoResult.jsp | 0 .../iteratorTag/showAppendIteratorTagDemo.jsp | 0 .../showIteratorGeneratorTagDemo.jsp | 0 .../iteratorTag/showMergeIteratorTagDemo.jsp | 0 .../iteratorTag/subsetIteratorTagDemo.jsp | 0 .../subsetIteratorTagDemoResult.jsp | 0 .../tags/ui/actionTagExampleCalled.jsp | 2 +- .../tags/ui/actionTagExampleCalling.jsp | 46 +++++++-------- .../tags/ui/componentTagExample.jsp | 0 .../tags/ui/datepicker/index.jsp | 0 .../tags/ui/dynamicTreeSelect.jsp | 0 .../webapp/{ => WEB-INF}/tags/ui/example.jsp | 0 .../webapp/{ => WEB-INF}/tags/ui/example.vm | 0 .../{ => WEB-INF}/tags/ui/exampleSubmited.jsp | 0 .../{ => WEB-INF}/tags/ui/exampleSubmited.vm | 0 .../tags/ui/images/backgroundImage.jpg | Bin .../{ => WEB-INF}/tags/ui/images/leopard.jpg | Bin .../tags/ui/lotsOfOptiontransferselect.jsp | 0 .../ui/lotsOfOptiontransferselectSubmit.jsp | 0 .../{ => WEB-INF}/tags/ui/moreSelects.jsp | 0 .../tags/ui/moreSelectsSubmit.jsp | 0 .../tags/ui/staticTreeSelect.jsp | 0 .../tags/ui/timepicker/index.jsp | 0 .../tags/ui/treeExampleAjaxDynamic.ftl | 0 .../tags/ui/treeExampleAjaxDynamic.jsp | 0 .../tags/ui/treeExampleDynamic.jsp | 0 .../tags/ui/treeExampleStatic.jsp | 0 .../template/xhtml/mytemplate.jsp | 0 .../main/webapp/{ => WEB-INF}/tiles/body.ftl | 0 .../main/webapp/{ => WEB-INF}/tiles/body.jsp | 0 .../webapp/{ => WEB-INF}/tiles/header.jsp | 0 .../webapp/{ => WEB-INF}/tiles/layout.ftl | 0 .../webapp/{ => WEB-INF}/tiles/layout.jsp | 0 .../webapp/{ => WEB-INF}/token/doublePost.jsp | 0 .../webapp/{ => WEB-INF}/token/example1.jsp | 0 .../webapp/{ => WEB-INF}/token/example2.jsp | 0 .../webapp/{ => WEB-INF}/token/example3.jsp | 0 .../webapp/{ => WEB-INF}/token/example4.ftl | 0 .../main/webapp/{ => WEB-INF}/token/index.jsp | 0 .../{ => WEB-INF}/token/transferDone.jsp | 0 .../clientSideValidationExample.jsp | 0 .../validation/fieldValidatorsExample.jsp | 0 .../{ => WEB-INF}/validation/footer.jsp | 0 .../webapp/{ => WEB-INF}/validation/index.jsp | 0 .../validation/nonFieldValidatorsExample.jsp | 0 .../{ => WEB-INF}/validation/quiz-ajax.jsp | 0 .../{ => WEB-INF}/validation/quiz-basic.jsp | 0 .../validation/quiz-client-css.jsp | 0 .../{ => WEB-INF}/validation/quiz-client.jsp | 0 .../{ => WEB-INF}/validation/quiz-success.jsp | 0 .../storeErrorsAcrossRequestCancel.jsp | 0 .../storeErrorsAcrossRequestExample.jsp | 0 .../validation/storeErrorsAcrossRequestOk.jsp | 0 .../successClientSideValidationExample.jsp | 0 .../successFieldValidatorsExample.jsp | 0 .../successNonFieldValidatorsExample.jsp | 0 .../successVisitorValidatorsExample.jsp | 0 .../validation/visitorValidatorsExample.jsp | 0 .../main/webapp/{ => WEB-INF}/viewSource.jsp | 0 .../webapp/{ => WEB-INF}/wait/complete.jsp | 0 .../webapp/{ => WEB-INF}/wait/example1.jsp | 0 .../webapp/{ => WEB-INF}/wait/example2.jsp | 0 .../webapp/{ => WEB-INF}/wait/example3.jsp | 0 .../main/webapp/{ => WEB-INF}/wait/index.jsp | 0 .../main/webapp/{ => WEB-INF}/wait/wait.jsp | 0 .../main/webapp/{ => WEB-INF}/xslt/index.jsp | 0 219 files changed, 212 insertions(+), 212 deletions(-) rename apps/showcase/src/main/webapp/{ => WEB-INF}/actionchaining/actionChainingResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/AjaxResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/AjaxResult2.js (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/AjaxResult3.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/autocompleter/index.jsp (98%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/bind/index.jsp (96%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/commonInclude.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/footer.jsp (67%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/options.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotebutton/index.jsp (96%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example1.jsp (88%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example10.jsp (91%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example2.jsp (91%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example3.jsp (90%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example4.jsp (91%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example5.jsp (90%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example6.jsp (89%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example7.jsp (89%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example8.jsp (95%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/example9.jsp (96%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotediv/index.jsp (95%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remoteforms/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/remotelink/index.jsp (98%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/example1.jsp (98%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/example2.jsp (90%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/example3.jsp (96%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/example4.jsp (96%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/example5.jsp (93%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/example5Ok.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/example6.jsp (94%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/index.jsp (94%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/nodecorate/panel1.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/nodecorate/panel2.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/nodecorate/panel2Submit.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/nodecorate/panel3.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tabbedpanel/nodecorate/panel3Submit.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/testjs.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tree/getCategory.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tree/partialChunkHeader.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tree/toggle.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/tree/tree.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/ajax/widgets/index.jsp (94%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/chatLogin.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/createRoom.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/messagesAvailableInRoom.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/roomSelection.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/roomsAvailable.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/sendMessageToRoomResult.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/showRoom.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/usersAvailable.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/chat/usersAvailableInRoom.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/Address.java.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/AddressAction.java.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/EnumTypeConverter.java.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/OperationsEnum.java.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/OperationsEnumAction.java.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/OperationsEnumActionConversion.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/Person.java.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/PersonAction.java.txt (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/enterAddressInfo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/enterOperations.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/enterPersonInfo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/showAddressInfo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/showOperations.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/conversion/showPersonInfo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/customTemplateDir/customTheme/ftlCustomTemplate.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/customTemplateDir/customTheme/jspCustomTemplate.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/date.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/empmanager/editEmployee.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/empmanager/editSkill.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/empmanager/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/empmanager/listEmployees.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/empmanager/listSkills.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/filedownload/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/fileupload/multipleUploadUsingArray.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/fileupload/multipleUploadUsingList.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/fileupload/upload-success.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/fileupload/upload.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/freemarker/customFreemarkerManagerUsage.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/freemarker/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/freemarker/standardTags.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/hangman/blank.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/hangman/hangmanAjax.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/hangman/hangmanNonAjax.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/hangman/updateCharacterAvailable.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/hangman/updateGuessLeft.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/hangman/updateScaffold.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/hangman/updateVocabCharacters.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/help.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/integration/modelDriven.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/integration/modelDrivenResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/demo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/example-action.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/jsp_0.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/jsp_1.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/jsp_2.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/jsp_3.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/jsp_4.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_0.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_1.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_2.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_3.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_4.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_5.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_6.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_7.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/interactive/ognl_8.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/jsf/employee/edit.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/jsf/employee/list.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/jsf/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/modelDriven/modelDriven.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/modelDriven/modelDrivenResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/person/edit-person.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/person/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/person/list-people.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/person/new-person.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/showcase.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionPrefix/actionPrefix.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionPrefix/actionPrefixExample.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionPrefix/methodPrefix.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionPrefix/normalSubmit.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionPrefix/redirectActionPrefix.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionTag/includedPage.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionTag/includedPage2.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionTag/includedPage3.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/actionTag/showActionTagDemo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/date.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/debug.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/ifTag/testIf.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/ifTag/testIf.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/actionTagExampleCalled.jsp (55%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/actionTagExampleCalling.jsp (94%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/componentTagExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/datepicker/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/dynamicTreeSelect.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/example.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/example.vm (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/exampleSubmited.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/exampleSubmited.vm (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/images/backgroundImage.jpg (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/images/leopard.jpg (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/lotsOfOptiontransferselect.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/lotsOfOptiontransferselectSubmit.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/moreSelects.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/moreSelectsSubmit.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/staticTreeSelect.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/timepicker/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/treeExampleAjaxDynamic.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/treeExampleAjaxDynamic.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/treeExampleDynamic.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tags/ui/treeExampleStatic.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/template/xhtml/mytemplate.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tiles/body.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tiles/body.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tiles/header.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tiles/layout.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/tiles/layout.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/token/doublePost.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/token/example1.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/token/example2.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/token/example3.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/token/example4.ftl (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/token/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/token/transferDone.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/clientSideValidationExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/fieldValidatorsExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/footer.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/nonFieldValidatorsExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/quiz-ajax.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/quiz-basic.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/quiz-client-css.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/quiz-client.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/quiz-success.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/storeErrorsAcrossRequestCancel.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/storeErrorsAcrossRequestExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/storeErrorsAcrossRequestOk.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/successClientSideValidationExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/successFieldValidatorsExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/successNonFieldValidatorsExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/successVisitorValidatorsExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/validation/visitorValidatorsExample.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/viewSource.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/wait/complete.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/wait/example1.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/wait/example2.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/wait/example3.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/wait/index.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/wait/wait.jsp (100%) rename apps/showcase/src/main/webapp/{ => WEB-INF}/xslt/index.jsp (100%) diff --git a/apps/showcase/src/main/resources/struts-actionchaining.xml b/apps/showcase/src/main/resources/struts-actionchaining.xml index bdefeb0a2..94d8b2857 100644 --- a/apps/showcase/src/main/resources/struts-actionchaining.xml +++ b/apps/showcase/src/main/resources/struts-actionchaining.xml @@ -12,7 +12,7 @@ actionChain3 - /actionchaining/actionChainingResult.jsp + /WEB-INF/actionchaining/actionChainingResult.jsp diff --git a/apps/showcase/src/main/resources/struts-ajax.xml b/apps/showcase/src/main/resources/struts-ajax.xml index 910112cf7..43d087686 100644 --- a/apps/showcase/src/main/resources/struts-ajax.xml +++ b/apps/showcase/src/main/resources/struts-ajax.xml @@ -6,27 +6,27 @@ - /ajax/AjaxResult.jsp + /WEB-INF/ajax/AjaxResult.jsp - /ajax/AjaxResult2.js + /WEB-INF/ajax/AjaxResult2.js - /ajax/AjaxResult3.jsp + /WEB-INF/ajax/AjaxResult3.jsp - /ajax/remoteforms/test2.jsp + /WEB-INF/ajax/remoteforms/test2.jsp - /ajax/remoteforms/test3.jsp + /WEB-INF/ajax/remoteforms/test3.jsp - /ajax/testjs.jsp + /WEB-INF/ajax/testjs.jsp @@ -34,54 +34,54 @@ - /ajax/tree/tree.jsp + /WEB-INF/ajax/tree/tree.jsp - /ajax/tree/getCategory.jsp + /WEB-INF/ajax/tree/getCategory.jsp - /ajax/tree/toggle.jsp + /WEB-INF/ajax/tree/toggle.jsp - /ajax/tabbedpanel/example4.ftl + /WEB-INF/ajax/tabbedpanel/example4.ftl - /ajax/tabbedpanel/example5.jsp - /ajax/tabbedpanel/example5Ok.jsp + /WEB-INF/ajax/tabbedpanel/example5.jsp + /WEB-INF/ajax/tabbedpanel/example5Ok.jsp - /ajax/tabbedpanel/nodecorate/panel1.ftl + /WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl - /ajax/tabbedpanel/nodecorate/panel2.ftl + /WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl - /ajax/tabbedpanel/nodecorate/panel3.ftl + /WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl - /ajax/tabbedpanel/nodecorate/panel2Submit.ftl + /WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl - /ajax/tabbedpanel/nodecorate/panel3Submit.ftl + /WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl - /ajax/options.ftl + /WEB-INF/ajax/options.ftl - /validation/quiz-ajax.jsp - /validation/quiz-success.jsp + /WEB-INF/validation/quiz-ajax.jsp + /WEB-INF/validation/quiz-success.jsp - /tags/ui/treeExampleAjaxDynamic.ftl + /WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl diff --git a/apps/showcase/src/main/resources/struts-chat.xml b/apps/showcase/src/main/resources/struts-chat.xml index 568b71a97..15ea15b1c 100644 --- a/apps/showcase/src/main/resources/struts-chat.xml +++ b/apps/showcase/src/main/resources/struts-chat.xml @@ -33,18 +33,18 @@ - /chat/chatLogin.ftl + /WEB-INF/chat/chatLogin.ftl - /chat/roomSelection.ftl + /WEB-INF/chat/roomSelection.ftl /chat/showRooms.action - /chat/chatLogin.ftl + /WEB-INF/chat/chatLogin.ftl @@ -54,12 +54,12 @@ - /chat/roomSelection.ftl + /WEB-INF/chat/roomSelection.ftl - /chat/showRoom.ftl + /WEB-INF/chat/showRoom.ftl @@ -100,35 +100,35 @@ - /chat/usersAvailable.ftl + /WEB-INF/chat/usersAvailable.ftl - /chat/roomsAvailable.ftl + /WEB-INF/chat/roomsAvailable.ftl - /chat/createRoom.ftl - /chat/createRoom.ftl + /WEB-INF/chat/createRoom.ftl + /WEB-INF/chat/createRoom.ftl - /chat/messagesAvailableInRoom.ftl - /chat/messagesAvailableInRoom.ftl + /WEB-INF/chat/messagesAvailableInRoom.ftl + /WEB-INF/chat/messagesAvailableInRoom.ftl - /chat/sendMessageToRoomResult.ftl - /chat/sendMessageToRoomResult.ftl + /WEB-INF/chat/sendMessageToRoomResult.ftl + /WEB-INF/chat/sendMessageToRoomResult.ftl - /chat/usersAvailableInRoom.ftl + /WEB-INF/chat/usersAvailableInRoom.ftl diff --git a/apps/showcase/src/main/resources/struts-conversion.xml b/apps/showcase/src/main/resources/struts-conversion.xml index ad0b1a975..27dd6875f 100644 --- a/apps/showcase/src/main/resources/struts-conversion.xml +++ b/apps/showcase/src/main/resources/struts-conversion.xml @@ -9,65 +9,65 @@ - enterPersonInfo.jsp + /WEB-INF/conversion/enterPersonInfo.jsp - showPersonInfo.jsp - enterPersonInfo.jsp + /WEB-INF/conversion/showPersonInfo.jsp + /WEB-INF/conversion/enterPersonInfo.jsp - /conversion/enterPersonInfo.jsp + /WEB-INF/conversion/enterPersonInfo.jsp - /conversion/PersonAction.java.txt + /WEB-INF/conversion/PersonAction.java.txt - /conversion/Person.java.txt + /WEB-INF/conversion/Person.java.txt - enterAddressInfo.jsp + /WEB-INF/conversion/enterAddressInfo.jsp - showAddressInfo.jsp - enterAddressInfo.jsp + /WEB-INF/conversion/showAddressInfo.jsp + /WEB-INF/conversion/enterAddressInfo.jsp - /conversion/enterAddressInfo.jsp + /WEB-INF/conversion/enterAddressInfo.jsp - /conversion/AddressAction.java.txt + /WEB-INF/conversion/AddressAction.java.txt - /conversion/Address.java.txt + /WEB-INF/conversion/Address.java.txt - enterOperations.jsp + /WEB-INF/conversion/enterOperations.jsp - showOperations.jsp - enterOperations.jsp + /WEB-INF/conversion/showOperations.jsp + /WEB-INF/conversion/enterOperations.jsp - /conversion/enterOperations.jsp + /WEB-INF/conversion/enterOperations.jsp - /conversion/OperationsEnum.java.txt + /WEB-INF/conversion/OperationsEnum.java.txt - /conversion/OperationsEnumAction.java.txt + /WEB-INF/conversion/OperationsEnumAction.java.txt - /conversion/EnumTypeConverter.java.txt + /WEB-INF/conversion/EnumTypeConverter.java.txt - /conversion/OperationsEnumActionConversion.txt + /WEB-INF/conversion/OperationsEnumActionConversion.txt diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml index 71071822e..5a81f614d 100644 --- a/apps/showcase/src/main/resources/struts-fileupload.xml +++ b/apps/showcase/src/main/resources/struts-fileupload.xml @@ -7,29 +7,29 @@ - upload.jsp + /WEB-INF/fileupload/upload.jsp - upload.jsp - upload-success.jsp + /WEB-INF/fileupload/upload.jsp + /WEB-INF/fileupload/upload-success.jsp - multipleUploadUsingList.jsp + /WEB-INF/fileupload/multipleUploadUsingList.jsp - multiple-success.jsp + /WEB-INF/fileupload/multiple-success.jsp - multipleUploadUsingArray.jsp + /WEB-INF/fileupload/multipleUploadUsingArray.jsp - multiple-success.jsp + /WEB-INF/fileupload/multiple-success.jsp diff --git a/apps/showcase/src/main/resources/struts-freemarker.xml b/apps/showcase/src/main/resources/struts-freemarker.xml index ae9334f13..8c70421cf 100644 --- a/apps/showcase/src/main/resources/struts-freemarker.xml +++ b/apps/showcase/src/main/resources/struts-freemarker.xml @@ -6,11 +6,11 @@ - /freemarker/customFreemarkerManagerUsage.ftl + /WEB-INF/freemarker/customFreemarkerManagerUsage.ftl - /freemarker/standardTags.ftl + /WEB-INF/freemarker/standardTags.ftl diff --git a/apps/showcase/src/main/resources/struts-hangman.xml b/apps/showcase/src/main/resources/struts-hangman.xml index 6c61a3db9..69abdbf7a 100644 --- a/apps/showcase/src/main/resources/struts-hangman.xml +++ b/apps/showcase/src/main/resources/struts-hangman.xml @@ -6,19 +6,19 @@ - /hangman/hangmanAjax.ftl + /WEB-INF/hangman/hangmanAjax.ftl - /hangman/hangmanNonAjax.ftl + /WEB-INF/hangman/hangmanNonAjax.ftl /hangman/test.ftl - /hangman/blank.ftl + /WEB-INF/hangman/blank.ftl - /hangman/hangmanNonAjax.ftl + /WEB-INF/hangman/hangmanNonAjax.ftl @@ -26,19 +26,19 @@ - /hangman/blank.ftl + /WEB-INF/hangman/blank.ftl - /hangman/updateVocabCharacters.ftl + /WEB-INF/hangman/updateVocabCharacters.ftl - /hangman/updateCharacterAvailable.ftl + /WEB-INF/hangman/updateCharacterAvailable.ftl - /hangman/updateScaffold.ftl + /WEB-INF/hangman/updateScaffold.ftl - /hangman/updateGuessLeft.ftl + /WEB-INF/hangman/updateGuessLeft.ftl diff --git a/apps/showcase/src/main/resources/struts-integration.xml b/apps/showcase/src/main/resources/struts-integration.xml index 71d2776a3..d251f7272 100644 --- a/apps/showcase/src/main/resources/struts-integration.xml +++ b/apps/showcase/src/main/resources/struts-integration.xml @@ -39,8 +39,8 @@ org.apache.struts2.showcase.integration.SaveGangsterAction true - modelDriven.jsp - modelDrivenResult.jsp + /WEB-INF/integration/modelDriven.jsp + /WEB-INF/integration/modelDrivenResult.jsp diff --git a/apps/showcase/src/main/resources/struts-interactive.xml b/apps/showcase/src/main/resources/struts-interactive.xml index 4c1d801f6..424aabb0d 100644 --- a/apps/showcase/src/main/resources/struts-interactive.xml +++ b/apps/showcase/src/main/resources/struts-interactive.xml @@ -9,7 +9,7 @@ - /interactive/demo.jsp + /WEB-INF/interactive/demo.jsp diff --git a/apps/showcase/src/main/resources/struts-model-driven.xml b/apps/showcase/src/main/resources/struts-model-driven.xml index cc085d18e..dc9b839a3 100644 --- a/apps/showcase/src/main/resources/struts-model-driven.xml +++ b/apps/showcase/src/main/resources/struts-model-driven.xml @@ -7,12 +7,12 @@ - modelDriven.jsp + /WEB-INF/modelDriven/modelDriven.jsp - modelDrivenResult.jsp + /WEB-INF/modelDriven/modelDrivenResult.jsp diff --git a/apps/showcase/src/main/resources/struts-tags-non-ui.xml b/apps/showcase/src/main/resources/struts-tags-non-ui.xml index 20c5a8dbb..c296fd202 100644 --- a/apps/showcase/src/main/resources/struts-tags-non-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-non-ui.xml @@ -11,19 +11,19 @@ - /tags/non-ui/actionTag/showActionTagDemo.jsp + /WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp - /tags/non-ui/actionTag/includedPage.jsp + /WEB-INF/tags/non-ui/actionTag/includedPage.jsp - /tags/non-ui/actionTag/includedPage2.jsp + /WEB-INF/tags/non-ui/actionTag/includedPage2.jsp - /tags/non-ui/actionTag/includedPage3.jsp + /WEB-INF/tags/non-ui/actionTag/includedPage3.jsp - /tags/non-ui/actionTag/showActionTagDemo.jsp + /WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp @@ -33,11 +33,11 @@ - /tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp - /tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp - /tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp + /WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp @@ -47,11 +47,11 @@ - /tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp - /tag/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp + /WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp @@ -61,11 +61,11 @@ - /tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp + /WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp @@ -74,11 +74,11 @@ - /tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp + /WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp + /WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp @@ -87,28 +87,28 @@ - /tags/non-ui/actionPrefix/actionPrefixExample.ftl + /WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl - /tags/non-ui/actionPrefix/normalSubmit.ftl + /WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl - /tags/non-ui/actionPrefix/methodPrefix.ftl + /WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl - /tags/non-ui/actionPrefix/actionPrefix.ftl + /WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl - /tags/non-ui/actionPrefix/redirectPrefix.ftl + /WEB-INF/tags/non-ui/actionPrefix/redirectPrefix.ftl - /tags/non-ui/actionPrefix/redirectActionPrefix.ftl + /WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl redirectActionPrefix - /tags/non-ui/actionPrefix/actionPrefixExample.ftl + /WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl @@ -117,10 +117,10 @@ - /tags/non-ui/ifTag/testIf.jsp + /WEB-INF/tags/non-ui/ifTag/testIf.jsp - /tags/non-ui/ifTag/testIf.ftl + /WEB-INF/tags/non-ui/ifTag/testIf.ftl @@ -129,7 +129,7 @@ - /tags/non-ui/debug.jsp + /WEB-INF/tags/non-ui/debug.jsp diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml index 449958fc5..563fbc1fc 100644 --- a/apps/showcase/src/main/resources/struts-tags-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-ui.xml @@ -6,57 +6,57 @@ - example.jsp - example.jsp + /WEB-INF/tags/ui/example.jsp + /WEB-INF/tags/ui/example.jsp - exampleSubmited.jsp - example.jsp + /WEB-INF/tags/ui/exampleSubmited.jsp + /WEB-INF/tags/ui/example.jsp - example.vm - example.vm + /WEB-INF/tags/ui/example.vm + /WEB-INF/tags/ui/example.vm - exampleSubmited.vm - example.vm + /WEB-INF/tags/ui/exampleSubmited.vm + /WEB-INF/tags/ui/example.vm - lotsOfOptiontransferselect.jsp + /WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp - lotsOfOptiontransferselect.jsp - lotsOfOptiontransferselectSubmit.jsp + /WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp + /WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp - moreSelects.jsp + /WEB-INF/tags/ui/moreSelects.jsp - moreSelects.jsp - moreSelectsSubmit.jsp + /WEB-INF/tags/ui/moreSelects.jsp + /WEB-INF/tags/ui/moreSelectsSubmit.jsp - /tags/ui/treeExampleDynamic.jsp + /WEB-INF/tags/ui/treeExampleDynamic.jsp - /tags/ui/treeExampleAjaxDynamic.jsp + /WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp - /tags/ui/componentTagExample.jsp + /WEB-INF/tags/ui/componentTagExample.jsp - /tags/ui/actionTagExampleCalled.jsp - /tags/ui/actionTagExampleCalling.jsp + /WEB-INF/tags/ui/actionTagExampleCalled.jsp + /WEB-INF/tags/ui/actionTagExampleCalling.jsp @@ -65,10 +65,10 @@ - /tags/ui/staticTreeSelect.jsp + /WEB-INF/tags/ui/staticTreeSelect.jsp - /tags/ui/dynamicTreeSelect.jsp + /WEB-INF/tags/ui/dynamicTreeSelect.jsp diff --git a/apps/showcase/src/main/resources/struts-tiles.xml b/apps/showcase/src/main/resources/struts-tiles.xml index d749d77b2..9fbe0258b 100644 --- a/apps/showcase/src/main/resources/struts-tiles.xml +++ b/apps/showcase/src/main/resources/struts-tiles.xml @@ -21,7 +21,7 @@ - /tiles/layout.jsp + /WEB-INF/tiles/layout.jsp /tiles/layout.jsp diff --git a/apps/showcase/src/main/resources/struts-token.xml b/apps/showcase/src/main/resources/struts-token.xml index 06f347730..d43435bd3 100644 --- a/apps/showcase/src/main/resources/struts-token.xml +++ b/apps/showcase/src/main/resources/struts-token.xml @@ -7,56 +7,56 @@ - example1.jsp + /WEB-INF/token/example1.jsp - doublePost.jsp - transferDone.jsp + /WEB-INF/token/doublePost.jsp + /WEB-INF/token/transferDone.jsp - example2.jsp + /WEB-INF/token/example2.jsp - doublePost.jsp - transferDone.jsp + /WEB-INF/token/doublePost.jsp + /WEB-INF/token/transferDone.jsp - example3.jsp + /WEB-INF/token/example3.jsp - doublePost.jsp - transferDone.jsp + /WEB-INF/token/doublePost.jsp + /WEB-INF/token/transferDone.jsp - example4.ftl + /WEB-INF/token/example4.ftl - doublePost.jsp - transferDone.jsp + /WEB-INF/token/doublePost.jsp + /WEB-INF/token/transferDone.jsp diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml index 5351b1ebc..778a2109b 100755 --- a/apps/showcase/src/main/resources/struts-validation.xml +++ b/apps/showcase/src/main/resources/struts-validation.xml @@ -40,12 +40,12 @@ - /validation/fieldValidatorsExample.jsp + /WEB-INF/validation/fieldValidatorsExample.jsp - /validation/fieldValidatorsExample.jsp - /validation/successFieldValidatorsExample.jsp + /WEB-INF/validation/fieldValidatorsExample.jsp + /WEB-INF/validation/successFieldValidatorsExample.jsp @@ -55,12 +55,12 @@ - /validation/nonFieldValidatorsExample.jsp + /WEB-INF/validation/nonFieldValidatorsExample.jsp - /validation/nonFieldValidatorsExample.jsp - /validation/successNonFieldValidatorsExample.jsp + /WEB-INF/validation/nonFieldValidatorsExample.jsp + /WEB-INF/validation/successNonFieldValidatorsExample.jsp @@ -70,12 +70,12 @@ - /validation/visitorValidatorsExample.jsp + /WEB-INF/validation/visitorValidatorsExample.jsp - /validation/visitorValidatorsExample.jsp - /validation/successVisitorValidatorsExample.jsp + /WEB-INF/validation/visitorValidatorsExample.jsp + /WEB-INF/validation/successVisitorValidatorsExample.jsp @@ -85,12 +85,12 @@ - /validation/clientSideValidationExample.jsp + /WEB-INF/validation/clientSideValidationExample.jsp - /validation/clientSideValidationExample.jsp - /validation/successClientSideValidationExample.jsp + /WEB-INF/validation/clientSideValidationExample.jsp + /WEB-INF/validation/successClientSideValidationExample.jsp @@ -109,16 +109,16 @@ RETRIEVE - /validation/storeErrorsAcrossRequestExample.jsp + /WEB-INF/validation/storeErrorsAcrossRequestExample.jsp RETRIEVE - /validation/storeErrorsAcrossRequestOk.jsp + /WEB-INF/validation/storeErrorsAcrossRequestOk.jsp - /validation/storeErrorsAcrossRequestCancel.jsp + /WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp diff --git a/apps/showcase/src/main/resources/struts-wait.xml b/apps/showcase/src/main/resources/struts-wait.xml index 521c2c754..8ea291124 100644 --- a/apps/showcase/src/main/resources/struts-wait.xml +++ b/apps/showcase/src/main/resources/struts-wait.xml @@ -9,8 +9,8 @@ - wait.jsp - complete.jsp + /WEB-INF/wait/wait.jsp + /WEB-INF/wait/complete.jsp @@ -18,8 +18,8 @@ 2000 - wait.jsp - complete.jsp + /WEB-INF/wait/wait.jsp + /WEB-INF/wait/complete.jsp @@ -28,8 +28,8 @@ 3000 1000 - wait.jsp - complete.jsp + /WEB-INF/wait/wait.jsp + /WEB-INF/wait/complete.jsp diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml index 3c1ebf3a4..74c59c651 100644 --- a/apps/showcase/src/main/resources/struts.xml +++ b/apps/showcase/src/main/resources/struts.xml @@ -75,15 +75,15 @@ - showcase.jsp + ../webapp/WEB-INF/showcase.jsp - viewSource.jsp + ../webapp/WEB-INF/viewSource.jsp - /date.jsp + /WEB-INF/date.jsp diff --git a/apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp similarity index 100% rename from apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp rename to apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp diff --git a/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp similarity index 100% rename from apps/showcase/src/main/webapp/ajax/AjaxResult.jsp rename to apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp diff --git a/apps/showcase/src/main/webapp/ajax/AjaxResult2.js b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js similarity index 100% rename from apps/showcase/src/main/webapp/ajax/AjaxResult2.js rename to apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js diff --git a/apps/showcase/src/main/webapp/ajax/AjaxResult3.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp similarity index 100% rename from apps/showcase/src/main/webapp/ajax/AjaxResult3.jsp rename to apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp diff --git a/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp similarity index 98% rename from apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp rename to apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp index 9079e7d3c..c67257fb1 100644 --- a/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp @@ -6,7 +6,7 @@ Ajax Examples - + diff --git a/apps/showcase/src/main/webapp/ajax/bind/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp similarity index 96% rename from apps/showcase/src/main/webapp/ajax/bind/index.jsp rename to apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp index 779e453af..046006cbb 100644 --- a/apps/showcase/src/main/webapp/ajax/bind/index.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp @@ -5,7 +5,7 @@ Bind Examples - +