angler-fishThe Vulnerability History Project

WW-3900 Refactor the Struts2 Showcase

      git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1400220 13f79535-47bb-0310-9956-ffa450edef68
by Sophia the Tiffany 2012-10-19 18:49:39 UTC
commit 59f4f31a7f3800a540c168abc67b8800db3f2f97
Struts VCC CVE-2013-2251
apps/showcase/pom.xml
+41 -21
apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
+72 -69
apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
+17 -17
apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
+255 -249
apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java
+34 -34
apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java
+102 -103
apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java
+12 -11
apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java
+5 -4
apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
+295 -307
apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
+54 -52
apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
+88 -83
apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java
+50 -46
apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java
+43 -37
apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
+45 -39
apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java
+14 -11
apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java
+24 -18
apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java
+30 -25
apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
+19 -17
apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java
+32 -32
apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java
+34 -34
apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java
+11 -19
apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
+60 -60
apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
+16 -16
apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
+5 -5
apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java
+105 -108
apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java
+11 -10
apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
+81 -76
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java
+20 -17
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatException.java
+9 -9
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java
+18 -18
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
+32 -31
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
+21 -20
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatMessage.java
+22 -24
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatService.java
+11 -19
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatServiceImpl.java
+73 -73
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java
+21 -20
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Constants.java
+1 -1
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java
+28 -27
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java
+29 -27
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
+26 -29
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java
+21 -25
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java
+30 -32
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Room.java
+74 -73
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java
+15 -15
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
+31 -36
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/User.java
+14 -15
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java
+15 -15
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java
+25 -27
apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Address.java
+6 -16
apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
+12 -16
apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/EnumTypeConverter.java
+22 -22
apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnum.java
+6 -5
apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java
+18 -21
apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Person.java
+9 -16
apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java
+14 -15
apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java
+32 -33
apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java
+12 -11
apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java
+29 -31
apps/showcase/src/main/java/org/apache/struts2/showcase/dao/SkillDao.java
+8 -9
apps/showcase/src/main/java/org/apache/struts2/showcase/exception/CreateException.java
+11 -10
apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DeleteException.java
+11 -10
apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DuplicateKeyException.java
+11 -10
apps/showcase/src/main/java/org/apache/struts2/showcase/exception/StorageException.java
+11 -10
apps/showcase/src/main/java/org/apache/struts2/showcase/exception/UpdateException.java
+11 -10
apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
+14 -12
apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
+54 -56
apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
+28 -44
apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
+40 -45
apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java
+15 -13
apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java
+8 -8
apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java
+26 -26
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java
+24 -24
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java
+24 -23
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java
+67 -67
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanConstants.java
+2 -2
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanException.java
+14 -14
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanService.java
+7 -7
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/PropertiesVocabSource.java
+34 -34
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
+23 -22
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Vocab.java
+56 -61
apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/VocabSource.java
+1 -1
apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
+11 -11
apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
+76 -83
apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
+19 -14
apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
+80 -73
apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java
+142 -141
apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java
+3 -2
apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java
+31 -30
apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java
+32 -38
apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
+11 -10
apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
+47 -38
apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
+21 -19
apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
+21 -21
apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java
+47 -45
apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
+27 -28
apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java
+2 -1
apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
+199 -195
apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java
+10 -15
apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
+7 -7
apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
+37 -33
apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
+28 -30
apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
+38 -33
apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
+40 -35
apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
+39 -38
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java
+6 -6
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java
+71 -85
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java
+24 -29
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java
+22 -22
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java
+30 -32
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java
+23 -28
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java
+8 -8
apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java
+15 -12
apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
+53 -53
apps/showcase/src/main/resources/log4j.properties
+4 -9
apps/showcase/src/main/resources/struts-fileupload.xml
+2 -2
apps/showcase/src/main/resources/struts-hangman.xml
+3
apps/showcase/src/main/resources/struts-tags-non-ui.xml
-9
apps/showcase/src/main/resources/struts.xml
+7 -7
apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml
+67 -71
apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+90 -291
apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
+5 -14
apps/showcase/src/main/webapp/chat/chatLogin.ftl
+9 -20
apps/showcase/src/main/webapp/chat/roomSelection.ftl
+160 -167
apps/showcase/src/main/webapp/chat/showRoom.ftl
+157 -163
apps/showcase/src/main/webapp/continuations/guess.ftl
+18
apps/showcase/src/main/webapp/conversion/enterAddressInfo.jsp
+39 -44
apps/showcase/src/main/webapp/conversion/enterOperations.jsp
+22 -29
apps/showcase/src/main/webapp/conversion/enterPersonInfo.jsp
+49 -58
apps/showcase/src/main/webapp/conversion/index.jsp
+16 -25
apps/showcase/src/main/webapp/conversion/showAddressInfo.jsp
+8 -14
apps/showcase/src/main/webapp/conversion/showOperations.jsp
+10 -14
apps/showcase/src/main/webapp/conversion/showPersonInfo.jsp
+7 -14
apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
+33 -46
apps/showcase/src/main/webapp/empmanager/editSkill.jsp
+22 -37
apps/showcase/src/main/webapp/empmanager/index.jsp
+21 -1
apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
+22 -39
apps/showcase/src/main/webapp/empmanager/listSkills.jsp
+20 -37
apps/showcase/src/main/webapp/filedownload/index.jsp
+12 -25
apps/showcase/src/main/webapp/fileupload/index.jsp
+25
apps/showcase/src/main/webapp/fileupload/multipleUploadUsingArray-success.jsp
+37
apps/showcase/src/main/webapp/fileupload/multipleUploadUsingArray.jsp
+11 -23
apps/showcase/src/main/webapp/fileupload/multipleUploadUsingList-success.jsp
+37
apps/showcase/src/main/webapp/fileupload/multipleUploadUsingList.jsp
+7 -19
apps/showcase/src/main/webapp/fileupload/upload-success.jsp
+10 -16
apps/showcase/src/main/webapp/fileupload/upload.jsp
+13 -17
apps/showcase/src/main/webapp/freemarker/customFreemarkerManagerUsage.ftl
+5 -13
apps/showcase/src/main/webapp/freemarker/index.jsp
+22 -1
apps/showcase/src/main/webapp/freemarker/standardTags.ftl
+4 -24
apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl
+225 -234
apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl
+18
apps/showcase/src/main/webapp/hangman/hangmanNonAjax.ftl
+126 -135
apps/showcase/src/main/webapp/help.jsp
+21 -22
apps/showcase/src/main/webapp/integration/modelDriven.jsp
+23 -36
apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp
+17 -36
apps/showcase/src/main/webapp/interactive/index.jsp
+7 -1
apps/showcase/src/main/webapp/jsf/employee/edit.jsp
+79 -86
apps/showcase/src/main/webapp/jsf/employee/list.jsp
+40 -46
apps/showcase/src/main/webapp/jsf/index.jsp
+15 -26
apps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
+24 -35
apps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
+16 -34
apps/showcase/src/main/webapp/person/edit-person.jsp
+34 -44
apps/showcase/src/main/webapp/person/index.jsp
+16 -1
apps/showcase/src/main/webapp/person/list-people.ftl
+22 -36
apps/showcase/src/main/webapp/person/new-person.ftl
+13 -41
apps/showcase/src/main/webapp/showcase.jsp
+46 -12
apps/showcase/src/main/webapp/styles/main.css
+5 -19
apps/showcase/src/main/webapp/tags/index.jsp
+16
apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl
+11 -17
apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
+45 -55
apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/index.jsp
+13
apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl
+10 -16
apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl
+9 -16
apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
+13 -19
apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
+1 -1
apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
+1 -1
apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
+1 -1
apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
+24 -33
apps/showcase/src/main/webapp/tags/non-ui/date.jsp
+95 -105
apps/showcase/src/main/webapp/tags/non-ui/debug.jsp
+11 -21
apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl
+582 -589
apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
+585 -588
apps/showcase/src/main/webapp/tags/non-ui/index.jsp
+24
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
+16 -25
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
+9 -19
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
+15 -23
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
+9 -18
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
+12 -20
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
+7 -19
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
+10 -19
apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
+10 -19
apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp
+7 -17
apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp
+53 -60
apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp
+18 -26
apps/showcase/src/main/webapp/tags/ui/example.jsp
+135 -142
apps/showcase/src/main/webapp/tags/ui/example.vm
+25 -30
apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
+42 -50
apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
+44 -52
apps/showcase/src/main/webapp/tags/ui/index.jsp
+25
apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
+83 -91
apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
+85 -94
apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp
+52 -60
apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp
+45 -55
apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
+15 -24
apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp
+7 -14
apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
+35 -43
apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
+40 -49
apps/showcase/src/main/webapp/tiles/body.ftl
+7 -13
apps/showcase/src/main/webapp/tiles/body.jsp
+13 -19
apps/showcase/src/main/webapp/tiles/header.jsp
+1 -3
apps/showcase/src/main/webapp/tiles/layout.ftl
+4 -2
apps/showcase/src/main/webapp/tiles/layout.jsp
+6 -2
apps/showcase/src/main/webapp/token/doublePost.jsp
+5 -18
apps/showcase/src/main/webapp/token/example1.jsp
+14 -40
apps/showcase/src/main/webapp/token/example2.jsp
+14 -28
apps/showcase/src/main/webapp/token/example3.jsp
+14 -27
apps/showcase/src/main/webapp/token/example4.ftl
+20 -34
apps/showcase/src/main/webapp/token/index.jsp
+21 -36
apps/showcase/src/main/webapp/token/transferDone.jsp
+15 -38
apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
+44 -53
apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
+44 -51
apps/showcase/src/main/webapp/validation/footer.jsp
+2 -1
apps/showcase/src/main/webapp/validation/index.jsp
+30 -39
apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
+25 -33
apps/showcase/src/main/webapp/validation/quiz-ajax.jsp
+71 -86
apps/showcase/src/main/webapp/validation/quiz-basic.jsp
+11 -25
apps/showcase/src/main/webapp/validation/quiz-client-css.jsp
+9 -22
apps/showcase/src/main/webapp/validation/quiz-client.jsp
+9 -22
apps/showcase/src/main/webapp/validation/quiz-success.jsp
+3 -16
apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp
+13 -22
apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp
+35 -45
apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp
+13 -21
apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
+8 -19
apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
+8 -21
apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
+7 -19
apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
+9 -20
apps/showcase/src/main/webapp/validation/validationExamplesStyles.css
+11
apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
+21 -28
apps/showcase/src/main/webapp/viewSource.jsp
+29 -43
apps/showcase/src/main/webapp/wait/complete.jsp
+5 -17
apps/showcase/src/main/webapp/wait/example1.jsp
+8 -20
apps/showcase/src/main/webapp/wait/example2.jsp
+8 -20
apps/showcase/src/main/webapp/wait/example3.jsp
+9 -20
apps/showcase/src/main/webapp/wait/index.jsp
+10 -25
apps/showcase/src/main/webapp/wait/wait.jsp
-37
expand_less