diff --git a/.gitignore b/.gitignore index 81d351f1a..313053b7b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,9 @@ .project .settings/ +# OSX +.DS_Store + # Scripts *.sh 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/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

+ + + + 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..d1cf0209c 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,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/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 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/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/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..a5ce83cf3 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,81 @@ - /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 + + + + + + /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 - /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..cfbac4abf 100644 --- a/apps/showcase/src/main/resources/struts-conversion.xml +++ b/apps/showcase/src/main/resources/struts-conversion.xml @@ -6,68 +6,72 @@ + + /WEB-INF/conversion/index.jsp + + - 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-filedownload.xml b/apps/showcase/src/main/resources/struts-filedownload.xml index a647e23d9..f05b4a42c 100644 --- a/apps/showcase/src/main/resources/struts-filedownload.xml +++ b/apps/showcase/src/main/resources/struts-filedownload.xml @@ -8,6 +8,10 @@ + + /WEB-INF/filedownload/index.jsp + + /images/struts.gif 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..ffff4ace4 100644 --- a/apps/showcase/src/main/resources/struts-integration.xml +++ b/apps/showcase/src/main/resources/struts-integration.xml @@ -32,15 +32,15 @@ org.apache.struts2.showcase.integration.EditGangsterAction - modelDriven.jsp + /WEB-INF/integration/modelDriven.jsp 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..24b28b758 100644 --- a/apps/showcase/src/main/resources/struts-interactive.xml +++ b/apps/showcase/src/main/resources/struts-interactive.xml @@ -4,12 +4,17 @@ "http://struts.apache.org/dtds/struts-2.3.dtd"> + + + /WEB-INF/interactive/index.jsp + + - /interactive/demo.jsp + /WEB-INF/interactive/demo.jsp diff --git a/apps/showcase/src/main/resources/struts-jsf.xml b/apps/showcase/src/main/resources/struts-jsf.xml index 431c70196..baa458a73 100644 --- a/apps/showcase/src/main/resources/struts-jsf.xml +++ b/apps/showcase/src/main/resources/struts-jsf.xml @@ -20,6 +20,10 @@ + + /WEB-INF/jsf/index.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..9722b52e8 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 @@ -128,8 +128,11 @@ + + /WEB-INF/tags/non-ui/date.jsp + - /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..cc779e575 100644 --- a/apps/showcase/src/main/resources/struts-tags-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-ui.xml @@ -6,57 +6,73 @@ - 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 + + /WEB-INF/tags/ui/treeExampleStatic.jsp + + - /tags/ui/treeExampleAjaxDynamic.jsp + /WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp + + + + /WEB-INF/tags/ui/componentTagExample.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 + + + + /WEB-INF/tags/ui/datepicker/index.jsp + + + + /WEB-INF/tags/ui/timepicker/index.jsp @@ -65,10 +81,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..ee40dc920 100755 --- a/apps/showcase/src/main/resources/struts-validation.xml +++ b/apps/showcase/src/main/resources/struts-validation.xml @@ -5,6 +5,10 @@ + + /WEB-INF/validation/index.jsp + + quiz-basic.jsp quiz-success.jsp @@ -40,12 +44,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 +59,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 +74,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 +89,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 +113,19 @@ RETRIEVE - /validation/storeErrorsAcrossRequestExample.jsp + /WEB-INF/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..0e09f4966 100644 --- a/apps/showcase/src/main/resources/struts-wait.xml +++ b/apps/showcase/src/main/resources/struts-wait.xml @@ -6,11 +6,23 @@ + + /WEB-INF/wait/example1.jsp + + + + /WEB-INF/wait/example2.jsp + + + + /WEB-INF/wait/example3.jsp + + - wait.jsp - complete.jsp + /WEB-INF/wait/wait.jsp + /WEB-INF/wait/complete.jsp @@ -18,8 +30,8 @@ 2000 - wait.jsp - complete.jsp + /WEB-INF/wait/wait.jsp + /WEB-INF/wait/complete.jsp @@ -28,8 +40,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..2df1d0f0e 100644 --- a/apps/showcase/src/main/resources/struts.xml +++ b/apps/showcase/src/main/resources/struts.xml @@ -9,13 +9,14 @@ + - + @@ -75,15 +76,15 @@ - showcase.jsp + /WEB-INF/showcase.jsp - viewSource.jsp + /WEB-INF/viewSource.jsp - /date.jsp + /WEB-INF/date.jsp @@ -92,20 +93,20 @@ - /empmanager/listSkills.jsp + /WEB-INF/empmanager/listSkills.jsp - /empmanager/editSkill.jsp + /WEB-INF/empmanager/editSkill.jsp - /empmanager/editSkill.jsp + /WEB-INF/empmanager/editSkill.jsp list.action - /empmanager/editSkill.jsp + /WEB-INF/empmanager/editSkill.jsp list.action @@ -114,20 +115,20 @@ - /empmanager/listEmployees.jsp + /WEB-INF/empmanager/listEmployees.jsp {1} - /empmanager/editEmployee.jsp + /WEB-INF/empmanager/editEmployee.jsp execute - /empmanager/editEmployee.jsp + /WEB-INF/empmanager/editEmployee.jsp list.action - /empmanager/editEmployee.jsp + /WEB-INF/empmanager/editEmployee.jsp list.action 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 90% 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..0d29a6456 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 - + @@ -49,7 +49,8 @@ Using a JSON list returned from an action (href="/JSONList.action"), without autoComplete (autoComplete="false"), use indicator, search substring (searchType="substring")
- - - +

Force valid options (forceValidOption="true")
- @@ -116,8 +120,9 @@ Make dropdown's height to 180px (dropdownHeight="180") Disabled combobox (disabled="true")
@@ -133,8 +138,9 @@ Link two autocompleter elements. When the selected value in 'Autocompleter 1' ch

Autocompleter 1 @@ -142,6 +148,7 @@ Link two autocompleter elements. When the selected value in 'Autocompleter 1' ch Autocompleter 2 Bind Examples - +