You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/06/17 20:13:25 UTC
[05/11] struts git commit: Merge branch 'master' of
github.com:apache/struts
Merge branch 'master' of github.com:apache/struts
# By Johannes Geppert (9) and others
# Via Johannes Geppert (3) and Lukasz Lenart (1)
* 'master' of github.com:apache/struts:
Refactor showcase and migrate to bootstrap 3
WW-4505 Add plugin to support bean validation
Drops version of maven-compiler-plugin as this breaks build
WW-4503 Sitches to JDK7
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
Create README.md
Add test cases for ModelDriven action, standard actions and FieldMatch validator
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
Fix missing import of LoggerFactory
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6c9ca620
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6c9ca620
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6c9ca620
Branch: refs/heads/master
Commit: 6c9ca6201c2f7f4f4fbac28fad844bcd1e4d62ef
Parents: b922d5a 72e6f70
Author: Aaron Johnson <aa...@pearson.com>
Authored: Fri May 29 10:42:12 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Fri May 29 10:42:12 2015 -0500
----------------------------------------------------------------------
README.md | 35 +
.../webapp/WEB-INF/content/orders-index.jsp | 2 +-
.../src/main/webapp/css/bootstrap-theme.css | 124 +-
.../src/main/webapp/css/bootstrap-theme.css.map | 2 +-
.../src/main/webapp/css/bootstrap-theme.min.css | 6 +-
.../src/main/webapp/css/bootstrap.css | 803 +-
.../src/main/webapp/css/bootstrap.css.map | 2 +-
.../src/main/webapp/css/bootstrap.min.css | 6 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes
.../fonts/glyphicons-halflings-regular.svg | 485 +-
.../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
apps/showcase/pom.xml | 17 +
.../validation/BeanValidationExampleAction.java | 170 +
.../src/main/resources/struts-validation.xml | 8 +
apps/showcase/src/main/resources/struts.xml | 6 +-
.../actionchaining/actionChainingResult.jsp | 4 +-
.../WEB-INF/bean-validation/bean-validation.jsp | 57 +
.../WEB-INF/conversion/enterAddressInfo.jsp | 4 +-
.../WEB-INF/conversion/enterOperations.jsp | 4 +-
.../WEB-INF/conversion/enterPersonInfo.jsp | 4 +-
.../main/webapp/WEB-INF/conversion/index.jsp | 4 +-
.../WEB-INF/conversion/showAddressInfo.jsp | 4 +-
.../WEB-INF/conversion/showOperations.jsp | 4 +-
.../WEB-INF/conversion/showPersonInfo.jsp | 4 +-
.../src/main/webapp/WEB-INF/decorators/main.jsp | 246 +-
.../webapp/WEB-INF/empmanager/editEmployee.jsp | 7 +-
.../webapp/WEB-INF/empmanager/editSkill.jsp | 6 +-
.../webapp/WEB-INF/empmanager/listEmployees.jsp | 6 +-
.../webapp/WEB-INF/empmanager/listSkills.jsp | 6 +-
.../main/webapp/WEB-INF/filedownload/index.jsp | 6 +-
.../fileupload/multipleUploadUsingArray.jsp | 4 +-
.../fileupload/multipleUploadUsingList.jsp | 4 +-
.../WEB-INF/fileupload/upload-success.jsp | 4 +-
.../main/webapp/WEB-INF/fileupload/upload.jsp | 4 +-
.../freemarker/customFreemarkerManagerUsage.ftl | 4 +-
.../webapp/WEB-INF/freemarker/standardTags.ftl | 4 +-
.../webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 4 +-
apps/showcase/src/main/webapp/WEB-INF/help.jsp | 14 +-
.../webapp/WEB-INF/modelDriven/modelDriven.jsp | 4 +-
.../WEB-INF/modelDriven/modelDrivenResult.jsp | 4 +-
.../main/webapp/WEB-INF/person/edit-person.jsp | 6 +-
.../main/webapp/WEB-INF/person/list-people.ftl | 6 +-
.../main/webapp/WEB-INF/person/new-person.ftl | 6 +-
.../src/main/webapp/WEB-INF/showcase.jsp | 4 +-
.../tags/non-ui/actionPrefix/actionPrefix.ftl | 4 +-
.../non-ui/actionPrefix/actionPrefixExample.ftl | 4 +-
.../tags/non-ui/actionPrefix/methodPrefix.ftl | 4 +-
.../tags/non-ui/actionPrefix/normalSubmit.ftl | 4 +-
.../actionPrefix/redirectActionPrefix.ftl | 4 +-
.../tags/non-ui/actionTag/showActionTagDemo.jsp | 4 +-
.../main/webapp/WEB-INF/tags/non-ui/date.jsp | 4 +-
.../main/webapp/WEB-INF/tags/non-ui/debug.jsp | 4 +-
.../webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl | 4 +-
.../webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp | 4 +-
.../iteratorTag/appendIteratorTagDemoResult.jsp | 4 +-
.../iteratorGeneratorTagDemoResult.jsp | 4 +-
.../iteratorTag/mergeIteratorTagDemoResult.jsp | 4 +-
.../iteratorTag/showAppendIteratorTagDemo.jsp | 4 +-
.../showIteratorGeneratorTagDemo.jsp | 4 +-
.../iteratorTag/showMergeIteratorTagDemo.jsp | 4 +-
.../iteratorTag/subsetIteratorTagDemo.jsp | 4 +-
.../iteratorTag/subsetIteratorTagDemoResult.jsp | 4 +-
.../WEB-INF/tags/ui/actionTagExampleCalling.jsp | 4 +-
.../WEB-INF/tags/ui/componentTagExample.jsp | 4 +-
.../src/main/webapp/WEB-INF/tags/ui/example.jsp | 9 +-
.../src/main/webapp/WEB-INF/tags/ui/example.vm | 6 +-
.../webapp/WEB-INF/tags/ui/exampleSubmited.jsp | 4 +-
.../webapp/WEB-INF/tags/ui/exampleSubmited.vm | 7 +-
.../tags/ui/lotsOfOptiontransferselect.jsp | 4 +-
.../ui/lotsOfOptiontransferselectSubmit.jsp | 4 +-
.../main/webapp/WEB-INF/tags/ui/moreSelects.jsp | 4 +-
.../WEB-INF/tags/ui/moreSelectsSubmit.jsp | 4 +-
.../src/main/webapp/WEB-INF/tiles/body.ftl | 4 +-
.../src/main/webapp/WEB-INF/tiles/body.jsp | 4 +-
.../main/webapp/WEB-INF/token/doublePost.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example1.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example2.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example3.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example4.ftl | 4 +-
.../main/webapp/WEB-INF/token/transferDone.jsp | 4 +-
.../validation/clientSideValidationExample.jsp | 7 +-
.../validation/fieldValidatorsExample.jsp | 6 +-
.../main/webapp/WEB-INF/validation/footer.jsp | 8 -
.../main/webapp/WEB-INF/validation/index.jsp | 49 -
.../validation/nonFieldValidatorsExample.jsp | 7 +-
.../webapp/WEB-INF/validation/quiz-basic.jsp | 7 +-
.../WEB-INF/validation/quiz-client-css.jsp | 7 +-
.../webapp/WEB-INF/validation/quiz-client.jsp | 6 +-
.../webapp/WEB-INF/validation/quiz-success.jsp | 6 +-
.../storeErrorsAcrossRequestCancel.jsp | 6 +-
.../storeErrorsAcrossRequestExample.jsp | 6 +-
.../validation/storeErrorsAcrossRequestOk.jsp | 6 +-
.../successClientSideValidationExample.jsp | 6 +-
.../successFieldValidatorsExample.jsp | 6 +-
.../successNonFieldValidatorsExample.jsp | 32 +-
.../successVisitorValidatorsExample.jsp | 32 +-
.../validation/visitorValidatorsExample.jsp | 6 +-
.../src/main/webapp/WEB-INF/viewSource.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/complete.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/example1.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/example2.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/example3.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/wait.jsp | 4 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes
.../fonts/glyphicons-halflings-regular.svg | 288 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
.../src/main/webapp/js/bootstrap.min.js | 11 +-
.../src/main/webapp/js/jquery-1.8.2.min.js | 2 -
.../main/webapp/styles/bootstrap-responsive.css | 1058 --
.../webapp/styles/bootstrap-responsive.min.css | 9 -
.../src/main/webapp/styles/bootstrap-theme.css | 476 +
.../main/webapp/styles/bootstrap-theme.css.map | 1 +
.../main/webapp/styles/bootstrap-theme.min.css | 5 +
.../src/main/webapp/styles/bootstrap.css | 10316 +++++++++--------
.../src/main/webapp/styles/bootstrap.css.map | 1 +
.../src/main/webapp/styles/bootstrap.min.css | 12 +-
apps/showcase/src/main/webapp/styles/main.css | 10 +-
apps/showcase/src/main/webapp/token/index.html | 4 +-
apps/showcase/src/main/webapp/wait/index.html | 4 +-
assembly/pom.xml | 5 +
assembly/src/main/assembly/all.xml | 4 +
assembly/src/main/assembly/docs.xml | 4 +
bom/pom.xml | 5 +
.../apache/struts2/StrutsInternalTestCase.java | 6 +-
plugins/bean-validation/pom.xml | 70 +
.../beanvalidation/constraints/FieldMatch.java | 87 +
.../constraints/impl/FieldMatchValidator.java | 53 +
.../validation/constant/ValidatorConstants.java | 41 +
.../interceptor/BeanValidationInterceptor.java | 219 +
.../interceptor/BeanValidationManager.java | 34 +
.../DefaultBeanValidationManager.java | 118 +
.../src/main/resources/LICENSE.txt | 174 +
.../src/main/resources/NOTICE.txt | 8 +
.../src/main/resources/struts-plugin.xml | 75 +
.../BeanValidationInterceptorTest.java | 141 +
.../struts/beanvalidation/VoidResult.java | 29 +
.../beanvalidation/actions/FieldAction.java | 39 +
.../actions/FieldMatchAction.java | 80 +
.../actions/ModelDrivenAction.java | 38 +
.../struts/beanvalidation/models/Address.java | 40 +
.../struts/beanvalidation/models/Person.java | 67 +
.../src/test/resources/bean-validation-test.xml | 39 +
plugins/pom.xml | 1 +
pom.xml | 5 +
148 files changed, 9317 insertions(+), 6747 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/6c9ca620/pom.xml
----------------------------------------------------------------------