Merge branch 'feature/move-jsps-under-webinf' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/80cd0409 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/80cd0409 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/80cd0409 Branch: refs/heads/develop Commit: 80cd0409c45d53dad54d9dda0e9c5a63626070ec Parents: 040fd67 eb7b570 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Mar 6 22:07:37 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Mar 6 22:07:37 2014 +0100 ---------------------------------------------------------------------- .gitignore | 3 + apps/blank/src/main/webapp/WEB-INF/web.xml | 5 + apps/jboss-blank/src/main/resources/example.xml | 6 +- .../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 28 + .../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 + .../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 + .../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 + .../webapp/WEB-INF/jsp/example/Register.jsp | 3 + .../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 + .../jboss-blank/src/main/webapp/WEB-INF/web.xml | 17 + .../src/main/webapp/example/HelloWorld.jsp | 28 - .../src/main/webapp/example/Login.jsp | 15 - .../src/main/webapp/example/Menu.jsp | 3 - .../src/main/webapp/example/Missing.jsp | 11 - .../src/main/webapp/example/Register.jsp | 3 - .../src/main/webapp/example/Welcome.jsp | 18 - .../src/main/java/mailreader-support.xml | 10 +- .../src/main/webapp/ChangePassword.jsp | 25 - apps/mailreader/src/main/webapp/Error.jsp | 40 -- apps/mailreader/src/main/webapp/Footer.jsp | 6 - apps/mailreader/src/main/webapp/Login.jsp | 30 - apps/mailreader/src/main/webapp/MainMenu.jsp | 25 - .../mailreader/src/main/webapp/Registration.jsp | 115 ---- .../mailreader/src/main/webapp/Subscription.jsp | 60 -- .../main/webapp/WEB-INF/jsp/ChangePassword.jsp | 25 + .../src/main/webapp/WEB-INF/jsp/Error.jsp | 40 ++ .../src/main/webapp/WEB-INF/jsp/Footer.jsp | 6 + .../src/main/webapp/WEB-INF/jsp/Login.jsp | 30 + .../src/main/webapp/WEB-INF/jsp/MainMenu.jsp | 25 + .../main/webapp/WEB-INF/jsp/Registration.jsp | 115 ++++ .../main/webapp/WEB-INF/jsp/Subscription.jsp | 60 ++ .../src/main/webapp/WEB-INF/jsp/Welcome.jsp | 55 ++ apps/mailreader/src/main/webapp/WEB-INF/web.xml | 17 + apps/mailreader/src/main/webapp/Welcome.jsp | 55 -- .../src/main/webapp/WEB-INF/web.xml | 17 + .../main/resources/struts-actionchaining.xml | 2 +- .../showcase/src/main/resources/struts-ajax.xml | 69 ++- .../showcase/src/main/resources/struts-chat.xml | 28 +- .../src/main/resources/struts-conversion.xml | 44 +- .../src/main/resources/struts-filedownload.xml | 4 + .../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 | 6 +- .../src/main/resources/struts-interactive.xml | 7 +- apps/showcase/src/main/resources/struts-jsf.xml | 4 + .../src/main/resources/struts-model-driven.xml | 4 +- .../src/main/resources/struts-tags-non-ui.xml | 57 +- .../src/main/resources/struts-tags-ui.xml | 58 +- .../src/main/resources/struts-tiles.xml | 2 +- .../src/main/resources/struts-token.xml | 24 +- .../src/main/resources/struts-validation.xml | 37 +- .../showcase/src/main/resources/struts-wait.xml | 24 +- apps/showcase/src/main/resources/struts.xml | 25 +- .../actionchaining/actionChainingResult.jsp | 23 + .../src/main/webapp/WEB-INF/ajax/AjaxResult.jsp | 12 + .../src/main/webapp/WEB-INF/ajax/AjaxResult2.js | 2 + .../main/webapp/WEB-INF/ajax/AjaxResult3.jsp | 12 + .../webapp/WEB-INF/ajax/autocompleter/index.jsp | 186 ++++++ .../src/main/webapp/WEB-INF/ajax/bind/index.jsp | 61 ++ .../main/webapp/WEB-INF/ajax/commonInclude.jsp | 5 + .../src/main/webapp/WEB-INF/ajax/footer.jsp | 8 + .../src/main/webapp/WEB-INF/ajax/options.ftl | 5 + .../webapp/WEB-INF/ajax/remotebutton/index.jsp | 70 +++ .../webapp/WEB-INF/ajax/remotediv/example1.jsp | 23 + .../webapp/WEB-INF/ajax/remotediv/example10.jsp | 31 + .../webapp/WEB-INF/ajax/remotediv/example2.jsp | 28 + .../webapp/WEB-INF/ajax/remotediv/example3.jsp | 27 + .../webapp/WEB-INF/ajax/remotediv/example4.jsp | 28 + .../webapp/WEB-INF/ajax/remotediv/example5.jsp | 27 + .../webapp/WEB-INF/ajax/remotediv/example6.jsp | 24 + .../webapp/WEB-INF/ajax/remotediv/example7.jsp | 27 + .../webapp/WEB-INF/ajax/remotediv/example8.jsp | 57 ++ .../webapp/WEB-INF/ajax/remotediv/example9.jsp | 63 ++ .../webapp/WEB-INF/ajax/remotediv/index.jsp | 55 ++ .../webapp/WEB-INF/ajax/remoteforms/index.jsp | 119 ++++ .../webapp/WEB-INF/ajax/remotelink/index.jsp | 127 ++++ .../WEB-INF/ajax/tabbedpanel/example1.jsp | 95 +++ .../WEB-INF/ajax/tabbedpanel/example2.jsp | 26 + .../WEB-INF/ajax/tabbedpanel/example3.jsp | 46 ++ .../WEB-INF/ajax/tabbedpanel/example4.jsp | 57 ++ .../WEB-INF/ajax/tabbedpanel/example5.jsp | 29 + .../WEB-INF/ajax/tabbedpanel/example5Ok.jsp | 9 + .../WEB-INF/ajax/tabbedpanel/example6.jsp | 40 ++ .../webapp/WEB-INF/ajax/tabbedpanel/index.jsp | 28 + .../ajax/tabbedpanel/nodecorate/panel1.ftl | 3 + .../ajax/tabbedpanel/nodecorate/panel2.ftl | 7 + .../tabbedpanel/nodecorate/panel2Submit.ftl | 2 + .../ajax/tabbedpanel/nodecorate/panel3.ftl | 9 + .../tabbedpanel/nodecorate/panel3Submit.ftl | 2 + .../src/main/webapp/WEB-INF/ajax/testjs.jsp | 14 + .../webapp/WEB-INF/ajax/tree/getCategory.jsp | 23 + .../WEB-INF/ajax/tree/partialChunkHeader.jsp | 6 + .../main/webapp/WEB-INF/ajax/tree/toggle.jsp | 12 + .../src/main/webapp/WEB-INF/ajax/tree/tree.jsp | 13 + .../main/webapp/WEB-INF/ajax/widgets/index.jsp | 40 ++ .../src/main/webapp/WEB-INF/chat/chatLogin.ftl | 27 + .../src/main/webapp/WEB-INF/chat/createRoom.ftl | 2 + .../src/main/webapp/WEB-INF/chat/index.jsp | 3 + .../WEB-INF/chat/messagesAvailableInRoom.ftl | 33 + .../main/webapp/WEB-INF/chat/roomSelection.ftl | 172 ++++++ .../main/webapp/WEB-INF/chat/roomsAvailable.ftl | 44 ++ .../WEB-INF/chat/sendMessageToRoomResult.ftl | 2 + .../src/main/webapp/WEB-INF/chat/showRoom.ftl | 167 +++++ .../main/webapp/WEB-INF/chat/usersAvailable.ftl | 6 + .../WEB-INF/chat/usersAvailableInRoom.ftl | 8 + .../webapp/WEB-INF/conversion/Address.java.txt | 35 ++ .../WEB-INF/conversion/AddressAction.java.txt | 44 ++ .../conversion/EnumTypeConverter.java.txt | 55 ++ .../WEB-INF/conversion/OperationsEnum.java.txt | 30 + .../conversion/OperationsEnumAction.java.txt | 53 ++ .../OperationsEnumActionConversion.txt | 4 + .../webapp/WEB-INF/conversion/Person.java.txt | 34 + .../WEB-INF/conversion/PersonAction.java.txt | 43 ++ .../WEB-INF/conversion/enterAddressInfo.jsp | 53 ++ .../WEB-INF/conversion/enterOperations.jsp | 38 ++ .../WEB-INF/conversion/enterPersonInfo.jsp | 67 ++ .../main/webapp/WEB-INF/conversion/index.jsp | 35 ++ .../WEB-INF/conversion/showAddressInfo.jsp | 21 + .../WEB-INF/conversion/showOperations.jsp | 21 + .../WEB-INF/conversion/showPersonInfo.jsp | 24 + apps/showcase/src/main/webapp/WEB-INF/date.jsp | 2 + .../src/main/webapp/WEB-INF/decorators/main.jsp | 34 +- .../webapp/WEB-INF/empmanager/editEmployee.jsp | 56 ++ .../webapp/WEB-INF/empmanager/editSkill.jsp | 42 ++ .../webapp/WEB-INF/empmanager/listEmployees.jsp | 43 ++ .../webapp/WEB-INF/empmanager/listSkills.jsp | 41 ++ .../main/webapp/WEB-INF/filedownload/index.jsp | 36 ++ .../fileupload/multipleUploadUsingArray.jsp | 32 + .../fileupload/multipleUploadUsingList.jsp | 32 + .../WEB-INF/fileupload/upload-success.jsp | 31 + .../main/webapp/WEB-INF/fileupload/upload.jsp | 27 + .../freemarker/customFreemarkerManagerUsage.ftl | 34 + .../main/webapp/WEB-INF/freemarker/index.jsp | 3 + .../webapp/WEB-INF/freemarker/standardTags.ftl | 24 + .../src/main/webapp/WEB-INF/hangman/blank.ftl | 0 .../main/webapp/WEB-INF/hangman/hangmanAjax.ftl | 247 ++++++++ .../webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 144 +++++ .../hangman/updateCharacterAvailable.ftl | 45 ++ .../webapp/WEB-INF/hangman/updateGuessLeft.ftl | 7 + .../webapp/WEB-INF/hangman/updateScaffold.ftl | 3 + .../WEB-INF/hangman/updateVocabCharacters.ftl | 20 + apps/showcase/src/main/webapp/WEB-INF/help.jsp | 32 + .../webapp/WEB-INF/integration/modelDriven.jsp | 44 ++ .../WEB-INF/integration/modelDrivenResult.jsp | 43 ++ .../main/webapp/WEB-INF/interactive/demo.jsp | 0 .../WEB-INF/interactive/example-action.jsp | 76 +++ .../main/webapp/WEB-INF/interactive/index.jsp | 241 ++++++++ .../main/webapp/WEB-INF/interactive/jsp_0.jsp | 62 ++ .../main/webapp/WEB-INF/interactive/jsp_1.jsp | 52 ++ .../main/webapp/WEB-INF/interactive/jsp_2.jsp | 54 ++ .../main/webapp/WEB-INF/interactive/jsp_3.jsp | 65 ++ .../main/webapp/WEB-INF/interactive/jsp_4.jsp | 16 + .../main/webapp/WEB-INF/interactive/ognl_0.jsp | 30 + .../main/webapp/WEB-INF/interactive/ognl_1.jsp | 28 + .../main/webapp/WEB-INF/interactive/ognl_2.jsp | 43 ++ .../main/webapp/WEB-INF/interactive/ognl_3.jsp | 54 ++ .../main/webapp/WEB-INF/interactive/ognl_4.jsp | 32 + .../main/webapp/WEB-INF/interactive/ognl_5.jsp | 25 + .../main/webapp/WEB-INF/interactive/ognl_6.jsp | 43 ++ .../main/webapp/WEB-INF/interactive/ognl_7.jsp | 55 ++ .../main/webapp/WEB-INF/interactive/ognl_8.jsp | 18 + .../main/webapp/WEB-INF/jsf/employee/edit.jsp | 113 ++++ .../main/webapp/WEB-INF/jsf/employee/list.jsp | 75 +++ .../src/main/webapp/WEB-INF/jsf/index.jsp | 35 ++ .../webapp/WEB-INF/modelDriven/modelDriven.jsp | 42 ++ .../WEB-INF/modelDriven/modelDrivenResult.jsp | 42 ++ .../main/webapp/WEB-INF/person/edit-person.jsp | 53 ++ .../main/webapp/WEB-INF/person/list-people.ftl | 44 ++ .../main/webapp/WEB-INF/person/new-person.ftl | 49 ++ .../src/main/webapp/WEB-INF/showcase.jsp | 30 + .../tags/non-ui/actionPrefix/actionPrefix.ftl | 25 + .../non-ui/actionPrefix/actionPrefixExample.ftl | 54 ++ .../tags/non-ui/actionPrefix/methodPrefix.ftl | 25 + .../tags/non-ui/actionPrefix/normalSubmit.ftl | 24 + .../actionPrefix/redirectActionPrefix.ftl | 28 + .../tags/non-ui/actionTag/includedPage.jsp | 1 + .../tags/non-ui/actionTag/includedPage2.jsp | 2 + .../tags/non-ui/actionTag/includedPage3.jsp | 2 + .../tags/non-ui/actionTag/showActionTagDemo.jsp | 52 ++ .../main/webapp/WEB-INF/tags/non-ui/date.jsp | 114 ++++ .../main/webapp/WEB-INF/tags/non-ui/debug.jsp | 30 + .../webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl | 618 ++++++++++++++++++ .../webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp | 619 +++++++++++++++++++ .../iteratorTag/appendIteratorTagDemoResult.jsp | 34 + .../iteratorGeneratorTagDemoResult.jsp | 29 + .../iteratorTag/mergeIteratorTagDemoResult.jsp | 33 + .../iteratorTag/showAppendIteratorTagDemo.jsp | 28 + .../showIteratorGeneratorTagDemo.jsp | 29 + .../iteratorTag/showMergeIteratorTagDemo.jsp | 29 + .../iteratorTag/subsetIteratorTagDemo.jsp | 29 + .../iteratorTag/subsetIteratorTagDemoResult.jsp | 30 + .../WEB-INF/tags/ui/actionTagExampleCalled.jsp | 2 + .../WEB-INF/tags/ui/actionTagExampleCalling.jsp | 24 + .../WEB-INF/tags/ui/componentTagExample.jsp | 69 +++ .../webapp/WEB-INF/tags/ui/datepicker/index.jsp | 33 + .../WEB-INF/tags/ui/dynamicTreeSelect.jsp | 6 + .../src/main/webapp/WEB-INF/tags/ui/example.jsp | 149 +++++ .../src/main/webapp/WEB-INF/tags/ui/example.vm | 39 ++ .../webapp/WEB-INF/tags/ui/exampleSubmited.jsp | 58 ++ .../webapp/WEB-INF/tags/ui/exampleSubmited.vm | 61 ++ .../WEB-INF/tags/ui/images/backgroundImage.jpg | Bin 0 -> 13192 bytes .../webapp/WEB-INF/tags/ui/images/leopard.jpg | Bin 0 -> 3850 bytes .../tags/ui/lotsOfOptiontransferselect.jsp | 101 +++ .../ui/lotsOfOptiontransferselectSubmit.jsp | 103 +++ .../main/webapp/WEB-INF/tags/ui/moreSelects.jsp | 69 +++ .../WEB-INF/tags/ui/moreSelectsSubmit.jsp | 63 ++ .../webapp/WEB-INF/tags/ui/staticTreeSelect.jsp | 11 + .../webapp/WEB-INF/tags/ui/timepicker/index.jsp | 31 + .../WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl | 9 + .../WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp | 25 + .../WEB-INF/tags/ui/treeExampleDynamic.jsp | 54 ++ .../WEB-INF/tags/ui/treeExampleStatic.jsp | 61 ++ apps/showcase/src/main/webapp/WEB-INF/tiles.xml | 18 +- .../src/main/webapp/WEB-INF/tiles/body.ftl | 16 + .../src/main/webapp/WEB-INF/tiles/body.jsp | 24 + .../src/main/webapp/WEB-INF/tiles/header.jsp | 3 + .../src/main/webapp/WEB-INF/tiles/layout.ftl | 10 + .../src/main/webapp/WEB-INF/tiles/layout.jsp | 13 + .../main/webapp/WEB-INF/token/doublePost.jsp | 28 + .../src/main/webapp/WEB-INF/token/example1.jsp | 50 ++ .../src/main/webapp/WEB-INF/token/example2.jsp | 38 ++ .../src/main/webapp/WEB-INF/token/example3.jsp | 37 ++ .../src/main/webapp/WEB-INF/token/example4.ftl | 40 ++ .../main/webapp/WEB-INF/token/transferDone.jsp | 48 ++ .../validation/clientSideValidationExample.jsp | 64 ++ .../validation/fieldValidatorsExample.jsp | 63 ++ .../main/webapp/WEB-INF/validation/footer.jsp | 8 + .../main/webapp/WEB-INF/validation/index.jsp | 51 ++ .../validation/nonFieldValidatorsExample.jsp | 46 ++ .../webapp/WEB-INF/validation/quiz-ajax.jsp | 104 ++++ .../webapp/WEB-INF/validation/quiz-basic.jsp | 41 ++ .../WEB-INF/validation/quiz-client-css.jsp | 37 ++ .../webapp/WEB-INF/validation/quiz-client.jsp | 37 ++ .../webapp/WEB-INF/validation/quiz-success.jsp | 27 + .../storeErrorsAcrossRequestCancel.jsp | 30 + .../storeErrorsAcrossRequestExample.jsp | 54 ++ .../validation/storeErrorsAcrossRequestOk.jsp | 31 + .../successClientSideValidationExample.jsp | 64 ++ .../successFieldValidatorsExample.jsp | 61 ++ .../successNonFieldValidatorsExample.jsp | 45 ++ .../successVisitorValidatorsExample.jsp | 46 ++ .../validation/visitorValidatorsExample.jsp | 43 ++ .../src/main/webapp/WEB-INF/viewSource.jsp | 54 ++ .../src/main/webapp/WEB-INF/wait/complete.jsp | 25 + .../src/main/webapp/WEB-INF/wait/example1.jsp | 28 + .../src/main/webapp/WEB-INF/wait/example2.jsp | 29 + .../src/main/webapp/WEB-INF/wait/example3.jsp | 29 + .../src/main/webapp/WEB-INF/wait/wait.jsp | 53 ++ apps/showcase/src/main/webapp/WEB-INF/web.xml | 17 + .../src/main/webapp/WEB-INF/xslt/index.jsp | 26 + .../actionchaining/actionChainingResult.jsp | 23 - .../src/main/webapp/ajax/AjaxResult.jsp | 12 - .../src/main/webapp/ajax/AjaxResult2.js | 2 - .../src/main/webapp/ajax/AjaxResult3.jsp | 12 - .../main/webapp/ajax/autocompleter/index.jsp | 178 ------ .../src/main/webapp/ajax/bind/index.jsp | 61 -- .../src/main/webapp/ajax/commonInclude.jsp | 5 - apps/showcase/src/main/webapp/ajax/footer.jsp | 8 - apps/showcase/src/main/webapp/ajax/index.html | 24 + apps/showcase/src/main/webapp/ajax/index.jsp | 24 - apps/showcase/src/main/webapp/ajax/options.ftl | 5 - .../src/main/webapp/ajax/remotebutton/index.jsp | 70 --- .../src/main/webapp/ajax/remotediv/example1.jsp | 23 - .../main/webapp/ajax/remotediv/example10.jsp | 31 - .../src/main/webapp/ajax/remotediv/example2.jsp | 28 - .../src/main/webapp/ajax/remotediv/example3.jsp | 27 - .../src/main/webapp/ajax/remotediv/example4.jsp | 28 - .../src/main/webapp/ajax/remotediv/example5.jsp | 27 - .../src/main/webapp/ajax/remotediv/example6.jsp | 24 - .../src/main/webapp/ajax/remotediv/example7.jsp | 27 - .../src/main/webapp/ajax/remotediv/example8.jsp | 57 -- .../src/main/webapp/ajax/remotediv/example9.jsp | 63 -- .../src/main/webapp/ajax/remotediv/index.jsp | 55 -- .../src/main/webapp/ajax/remoteforms/index.jsp | 119 ---- .../src/main/webapp/ajax/remotelink/index.jsp | 127 ---- .../main/webapp/ajax/tabbedpanel/example1.jsp | 95 --- .../main/webapp/ajax/tabbedpanel/example2.jsp | 26 - .../main/webapp/ajax/tabbedpanel/example3.jsp | 46 -- .../main/webapp/ajax/tabbedpanel/example4.jsp | 57 -- .../main/webapp/ajax/tabbedpanel/example5.jsp | 29 - .../main/webapp/ajax/tabbedpanel/example5Ok.jsp | 9 - .../main/webapp/ajax/tabbedpanel/example6.jsp | 40 -- .../src/main/webapp/ajax/tabbedpanel/index.jsp | 28 - .../ajax/tabbedpanel/nodecorate/panel1.ftl | 3 - .../ajax/tabbedpanel/nodecorate/panel2.ftl | 7 - .../tabbedpanel/nodecorate/panel2Submit.ftl | 2 - .../ajax/tabbedpanel/nodecorate/panel3.ftl | 9 - .../tabbedpanel/nodecorate/panel3Submit.ftl | 2 - apps/showcase/src/main/webapp/ajax/testjs.jsp | 14 - .../src/main/webapp/ajax/tree/getCategory.jsp | 23 - .../webapp/ajax/tree/partialChunkHeader.jsp | 6 - .../src/main/webapp/ajax/tree/toggle.jsp | 12 - .../showcase/src/main/webapp/ajax/tree/tree.jsp | 13 - .../src/main/webapp/ajax/widgets/index.jsp | 40 -- .../showcase/src/main/webapp/chat/chatLogin.ftl | 27 - .../src/main/webapp/chat/createRoom.ftl | 2 - apps/showcase/src/main/webapp/chat/index.jsp | 3 - .../webapp/chat/messagesAvailableInRoom.ftl | 33 - .../src/main/webapp/chat/roomSelection.ftl | 172 ------ .../src/main/webapp/chat/roomsAvailable.ftl | 44 -- .../webapp/chat/sendMessageToRoomResult.ftl | 2 - apps/showcase/src/main/webapp/chat/showRoom.ftl | 167 ----- .../src/main/webapp/chat/usersAvailable.ftl | 6 - .../main/webapp/chat/usersAvailableInRoom.ftl | 8 - .../src/main/webapp/conversion/Address.java.txt | 35 -- .../webapp/conversion/AddressAction.java.txt | 44 -- .../conversion/EnumTypeConverter.java.txt | 55 -- .../webapp/conversion/OperationsEnum.java.txt | 30 - .../conversion/OperationsEnumAction.java.txt | 53 -- .../OperationsEnumActionConversion.txt | 4 - .../src/main/webapp/conversion/Person.java.txt | 34 - .../webapp/conversion/PersonAction.java.txt | 43 -- .../main/webapp/conversion/enterAddressInfo.jsp | 53 -- .../main/webapp/conversion/enterOperations.jsp | 38 -- .../main/webapp/conversion/enterPersonInfo.jsp | 67 -- .../src/main/webapp/conversion/index.jsp | 35 -- .../main/webapp/conversion/showAddressInfo.jsp | 21 - .../main/webapp/conversion/showOperations.jsp | 21 - .../main/webapp/conversion/showPersonInfo.jsp | 24 - apps/showcase/src/main/webapp/date.jsp | 2 - .../src/main/webapp/empmanager/editEmployee.jsp | 56 -- .../src/main/webapp/empmanager/editSkill.jsp | 42 -- .../src/main/webapp/empmanager/index.jsp | 1 - .../main/webapp/empmanager/listEmployees.jsp | 43 -- .../src/main/webapp/empmanager/listSkills.jsp | 41 -- .../src/main/webapp/filedownload/index.jsp | 36 -- .../fileupload/multipleUploadUsingArray.jsp | 32 - .../fileupload/multipleUploadUsingList.jsp | 32 - .../main/webapp/fileupload/upload-success.jsp | 31 - .../src/main/webapp/fileupload/upload.jsp | 27 - .../freemarker/customFreemarkerManagerUsage.ftl | 34 - .../src/main/webapp/freemarker/index.jsp | 3 - .../src/main/webapp/freemarker/standardTags.ftl | 24 - apps/showcase/src/main/webapp/hangman/blank.ftl | 0 .../src/main/webapp/hangman/hangmanAjax.ftl | 247 -------- .../src/main/webapp/hangman/hangmanNonAjax.ftl | 144 ----- .../webapp/hangman/updateCharacterAvailable.ftl | 45 -- .../src/main/webapp/hangman/updateGuessLeft.ftl | 7 - .../src/main/webapp/hangman/updateScaffold.ftl | 3 - .../webapp/hangman/updateVocabCharacters.ftl | 20 - apps/showcase/src/main/webapp/help.jsp | 32 - .../src/main/webapp/integration/modelDriven.jsp | 44 -- .../webapp/integration/modelDrivenResult.jsp | 43 -- .../src/main/webapp/interactive/demo.jsp | 0 .../main/webapp/interactive/example-action.jsp | 76 --- .../src/main/webapp/interactive/index.jsp | 241 -------- .../src/main/webapp/interactive/jsp_0.jsp | 62 -- .../src/main/webapp/interactive/jsp_1.jsp | 52 -- .../src/main/webapp/interactive/jsp_2.jsp | 54 -- .../src/main/webapp/interactive/jsp_3.jsp | 65 -- .../src/main/webapp/interactive/jsp_4.jsp | 16 - .../src/main/webapp/interactive/ognl_0.jsp | 30 - .../src/main/webapp/interactive/ognl_1.jsp | 28 - .../src/main/webapp/interactive/ognl_2.jsp | 43 -- .../src/main/webapp/interactive/ognl_3.jsp | 54 -- .../src/main/webapp/interactive/ognl_4.jsp | 32 - .../src/main/webapp/interactive/ognl_5.jsp | 25 - .../src/main/webapp/interactive/ognl_6.jsp | 43 -- .../src/main/webapp/interactive/ognl_7.jsp | 55 -- .../src/main/webapp/interactive/ognl_8.jsp | 18 - .../src/main/webapp/jsf/employee/edit.jsp | 113 ---- .../src/main/webapp/jsf/employee/list.jsp | 75 --- apps/showcase/src/main/webapp/jsf/index.jsp | 35 -- .../src/main/webapp/modelDriven/modelDriven.jsp | 42 -- .../webapp/modelDriven/modelDrivenResult.jsp | 42 -- .../src/main/webapp/person/edit-person.jsp | 53 -- apps/showcase/src/main/webapp/person/index.html | 10 + apps/showcase/src/main/webapp/person/index.jsp | 1 - .../src/main/webapp/person/list-people.ftl | 44 -- .../src/main/webapp/person/new-person.ftl | 49 -- apps/showcase/src/main/webapp/showcase.jsp | 30 - apps/showcase/src/main/webapp/skill/index.html | 10 + .../tags/non-ui/actionPrefix/actionPrefix.ftl | 25 - .../non-ui/actionPrefix/actionPrefixExample.ftl | 54 -- .../tags/non-ui/actionPrefix/methodPrefix.ftl | 25 - .../tags/non-ui/actionPrefix/normalSubmit.ftl | 24 - .../actionPrefix/redirectActionPrefix.ftl | 28 - .../tags/non-ui/actionTag/includedPage.jsp | 1 - .../tags/non-ui/actionTag/includedPage2.jsp | 2 - .../tags/non-ui/actionTag/includedPage3.jsp | 2 - .../tags/non-ui/actionTag/showActionTagDemo.jsp | 52 -- .../src/main/webapp/tags/non-ui/date.jsp | 114 ---- .../src/main/webapp/tags/non-ui/debug.jsp | 30 - .../main/webapp/tags/non-ui/ifTag/testIf.ftl | 618 ------------------ .../main/webapp/tags/non-ui/ifTag/testIf.jsp | 619 ------------------- .../iteratorTag/appendIteratorTagDemoResult.jsp | 34 - .../iteratorGeneratorTagDemoResult.jsp | 29 - .../iteratorTag/mergeIteratorTagDemoResult.jsp | 33 - .../iteratorTag/showAppendIteratorTagDemo.jsp | 28 - .../showIteratorGeneratorTagDemo.jsp | 29 - .../iteratorTag/showMergeIteratorTagDemo.jsp | 29 - .../iteratorTag/subsetIteratorTagDemo.jsp | 29 - .../iteratorTag/subsetIteratorTagDemoResult.jsp | 30 - .../webapp/tags/ui/actionTagExampleCalled.jsp | 2 - .../webapp/tags/ui/actionTagExampleCalling.jsp | 24 - .../main/webapp/tags/ui/componentTagExample.jsp | 69 --- .../main/webapp/tags/ui/datepicker/index.jsp | 33 - .../main/webapp/tags/ui/dynamicTreeSelect.jsp | 6 - .../src/main/webapp/tags/ui/example.jsp | 149 ----- .../showcase/src/main/webapp/tags/ui/example.vm | 39 -- .../src/main/webapp/tags/ui/exampleSubmited.jsp | 58 -- .../src/main/webapp/tags/ui/exampleSubmited.vm | 61 -- .../webapp/tags/ui/images/backgroundImage.jpg | Bin 13192 -> 0 bytes .../src/main/webapp/tags/ui/images/leopard.jpg | Bin 3850 -> 0 bytes .../tags/ui/lotsOfOptiontransferselect.jsp | 101 --- .../ui/lotsOfOptiontransferselectSubmit.jsp | 103 --- .../src/main/webapp/tags/ui/moreSelects.jsp | 69 --- .../main/webapp/tags/ui/moreSelectsSubmit.jsp | 63 -- .../main/webapp/tags/ui/staticTreeSelect.jsp | 11 - .../main/webapp/tags/ui/timepicker/index.jsp | 31 - .../webapp/tags/ui/treeExampleAjaxDynamic.ftl | 9 - .../webapp/tags/ui/treeExampleAjaxDynamic.jsp | 25 - .../main/webapp/tags/ui/treeExampleDynamic.jsp | 54 -- .../main/webapp/tags/ui/treeExampleStatic.jsp | 61 -- apps/showcase/src/main/webapp/tiles/body.ftl | 16 - apps/showcase/src/main/webapp/tiles/body.jsp | 24 - apps/showcase/src/main/webapp/tiles/header.jsp | 3 - apps/showcase/src/main/webapp/tiles/layout.ftl | 10 - apps/showcase/src/main/webapp/tiles/layout.jsp | 13 - .../src/main/webapp/token/doublePost.jsp | 28 - .../showcase/src/main/webapp/token/example1.jsp | 50 -- .../showcase/src/main/webapp/token/example2.jsp | 38 -- .../showcase/src/main/webapp/token/example3.jsp | 37 -- .../showcase/src/main/webapp/token/example4.ftl | 40 -- apps/showcase/src/main/webapp/token/index.html | 47 ++ apps/showcase/src/main/webapp/token/index.jsp | 48 -- .../src/main/webapp/token/transferDone.jsp | 48 -- .../validation/clientSideValidationExample.jsp | 64 -- .../validation/fieldValidatorsExample.jsp | 63 -- .../src/main/webapp/validation/footer.jsp | 8 - .../src/main/webapp/validation/index.jsp | 51 -- .../validation/nonFieldValidatorsExample.jsp | 46 -- .../src/main/webapp/validation/quiz-ajax.jsp | 104 ---- .../src/main/webapp/validation/quiz-basic.jsp | 41 -- .../main/webapp/validation/quiz-client-css.jsp | 37 -- .../src/main/webapp/validation/quiz-client.jsp | 37 -- .../src/main/webapp/validation/quiz-success.jsp | 27 - .../storeErrorsAcrossRequestCancel.jsp | 30 - .../storeErrorsAcrossRequestExample.jsp | 54 -- .../validation/storeErrorsAcrossRequestOk.jsp | 31 - .../successClientSideValidationExample.jsp | 64 -- .../successFieldValidatorsExample.jsp | 61 -- .../successNonFieldValidatorsExample.jsp | 45 -- .../successVisitorValidatorsExample.jsp | 46 -- .../validation/visitorValidatorsExample.jsp | 43 -- apps/showcase/src/main/webapp/viewSource.jsp | 54 -- apps/showcase/src/main/webapp/wait/complete.jsp | 25 - apps/showcase/src/main/webapp/wait/example1.jsp | 28 - apps/showcase/src/main/webapp/wait/example2.jsp | 29 - apps/showcase/src/main/webapp/wait/example3.jsp | 29 - apps/showcase/src/main/webapp/wait/index.html | 33 + apps/showcase/src/main/webapp/wait/index.jsp | 34 - apps/showcase/src/main/webapp/wait/wait.jsp | 53 -- apps/showcase/src/main/webapp/xslt/index.jsp | 26 - 455 files changed, 9998 insertions(+), 9815 deletions(-) ----------------------------------------------------------------------
