Merge branch 'release/2.3.19'
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aebdad9f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aebdad9f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aebdad9f Branch: refs/heads/develop Commit: aebdad9f6cc50abba8555beb2e1604991a53d302 Parents: d2663ce f7f4915 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Nov 17 11:31:52 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Nov 17 11:31:52 2014 +0100 ---------------------------------------------------------------------- apps/blank/pom.xml | 7 +- .../blank/src/main/java/example/HelloWorld.java | 7 + apps/blank/src/main/java/example/YesNo.java | 5 + .../main/resources/example/package.properties | 2 + .../src/main/resources/velocity.properties | 1 + .../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 4 +- apps/jboss-blank/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/mailreader/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/pom.xml | 2 +- apps/portlet/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/rest-showcase/pom.xml | 8 +- .../src/main/resources/log4j.properties | 13 +- .../src/main/resources/velocity.properties | 1 + .../WEB-INF/content/orders-deleteConfirm.jsp | 25 +- .../main/webapp/WEB-INF/content/orders-edit.jsp | 57 +- .../webapp/WEB-INF/content/orders-editNew.jsp | 49 +- .../webapp/WEB-INF/content/orders-index.jsp | 31 +- .../main/webapp/WEB-INF/content/orders-show.jsp | 25 +- .../main/webapp/css/bootstrap-responsive.css | 1058 - .../webapp/css/bootstrap-responsive.min.css | 9 - .../src/main/webapp/css/bootstrap-theme.css | 442 + .../src/main/webapp/css/bootstrap-theme.css.map | 1 + .../src/main/webapp/css/bootstrap-theme.min.css | 5 + .../src/main/webapp/css/bootstrap.css | 9865 ++--- .../src/main/webapp/css/bootstrap.css.map | 1 + .../src/main/webapp/css/bootstrap.min.css | 12 +- .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes .../webapp/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../main/webapp/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes apps/showcase/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/showcase/src/main/webapp/index.html | 10 + apps/showcase/src/main/webapp/index.jsp | 1 - archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 3 +- .../src/main/webapp/WEB-INF/content/hello.jsp | 9 +- .../src/main/webapp/js/bootstrap.js | 25 +- .../src/main/webapp/js/controllers.js | 27 +- .../webapp/js/lib/angular/angular-animate.js | 1689 + .../js/lib/angular/angular-animate.min.js | 28 + .../js/lib/angular/angular-animate.min.js.map | 8 + .../lib/angular/angular-bootstrap-prettify.js | 1845 - .../angular/angular-bootstrap-prettify.min.js | 41 - .../webapp/js/lib/angular/angular-bootstrap.js | 175 - .../js/lib/angular/angular-bootstrap.min.js | 9 - .../webapp/js/lib/angular/angular-cookies.js | 104 +- .../js/lib/angular/angular-cookies.min.js | 9 +- .../js/lib/angular/angular-cookies.min.js.map | 8 + .../main/webapp/js/lib/angular/angular-csp.css | 24 + .../webapp/js/lib/angular/angular-loader.js | 230 +- .../webapp/js/lib/angular/angular-loader.min.js | 10 +- .../js/lib/angular/angular-loader.min.js.map | 8 + .../main/webapp/js/lib/angular/angular-mocks.js | 1250 +- .../webapp/js/lib/angular/angular-resource.js | 540 +- .../js/lib/angular/angular-resource.min.js | 17 +- .../js/lib/angular/angular-resource.min.js.map | 8 + .../main/webapp/js/lib/angular/angular-route.js | 925 + .../webapp/js/lib/angular/angular-route.min.js | 14 + .../js/lib/angular/angular-route.min.js.map | 8 + .../webapp/js/lib/angular/angular-sanitize.js | 503 +- .../js/lib/angular/angular-sanitize.min.js | 22 +- .../js/lib/angular/angular-sanitize.min.js.map | 8 + .../webapp/js/lib/angular/angular-scenario.js | 32603 ++++++++++------- .../main/webapp/js/lib/angular/angular-touch.js | 584 + .../webapp/js/lib/angular/angular-touch.min.js | 13 + .../js/lib/angular/angular-touch.min.js.map | 8 + .../src/main/webapp/js/lib/angular/angular.js | 18656 +++++++--- .../main/webapp/js/lib/angular/angular.min.js | 372 +- .../webapp/js/lib/angular/angular.min.js.map | 8 + .../src/main/webapp/js/lib/angular/errors.json | 1 + .../js/lib/angular/i18n/angular-locale_af-na.js | 1 + .../js/lib/angular/i18n/angular-locale_af-za.js | 1 + .../js/lib/angular/i18n/angular-locale_af.js | 1 + .../js/lib/angular/i18n/angular-locale_am-et.js | 1 + .../js/lib/angular/i18n/angular-locale_am.js | 1 + .../lib/angular/i18n/angular-locale_ar-001.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ae.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-bh.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-dz.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-eg.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-iq.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-jo.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-kw.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-lb.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ly.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ma.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-om.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-qa.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sa.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sd.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sy.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-tn.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ye.js | 1 + .../js/lib/angular/i18n/angular-locale_ar.js | 1 + .../js/lib/angular/i18n/angular-locale_bg-bg.js | 1 + .../js/lib/angular/i18n/angular-locale_bg.js | 1 + .../js/lib/angular/i18n/angular-locale_bn-bd.js | 1 + .../js/lib/angular/i18n/angular-locale_bn-in.js | 1 + .../js/lib/angular/i18n/angular-locale_bn.js | 1 + .../js/lib/angular/i18n/angular-locale_ca-ad.js | 1 + .../js/lib/angular/i18n/angular-locale_ca-es.js | 1 + .../js/lib/angular/i18n/angular-locale_ca.js | 1 + .../js/lib/angular/i18n/angular-locale_chr.js | 4 - .../js/lib/angular/i18n/angular-locale_cs-cz.js | 1 + .../js/lib/angular/i18n/angular-locale_cs.js | 1 + .../js/lib/angular/i18n/angular-locale_cy.js | 4 - .../js/lib/angular/i18n/angular-locale_da-dk.js | 1 + .../js/lib/angular/i18n/angular-locale_da.js | 1 + .../js/lib/angular/i18n/angular-locale_de-at.js | 1 + .../js/lib/angular/i18n/angular-locale_de-be.js | 1 + .../js/lib/angular/i18n/angular-locale_de-ch.js | 1 + .../js/lib/angular/i18n/angular-locale_de-de.js | 1 + .../js/lib/angular/i18n/angular-locale_de-li.js | 1 + .../js/lib/angular/i18n/angular-locale_de-lu.js | 1 + .../js/lib/angular/i18n/angular-locale_de.js | 1 + .../js/lib/angular/i18n/angular-locale_el-cy.js | 1 + .../js/lib/angular/i18n/angular-locale_el-gr.js | 1 + .../angular/i18n/angular-locale_el-polyton.js | 4 - .../js/lib/angular/i18n/angular-locale_el.js | 1 + .../js/lib/angular/i18n/angular-locale_en-as.js | 1 + .../js/lib/angular/i18n/angular-locale_en-au.js | 1 + .../js/lib/angular/i18n/angular-locale_en-bb.js | 1 + .../js/lib/angular/i18n/angular-locale_en-be.js | 1 + .../js/lib/angular/i18n/angular-locale_en-bm.js | 1 + .../js/lib/angular/i18n/angular-locale_en-bw.js | 1 + .../js/lib/angular/i18n/angular-locale_en-bz.js | 1 + .../js/lib/angular/i18n/angular-locale_en-ca.js | 1 + .../angular/i18n/angular-locale_en-dsrt-us.js | 1 + .../lib/angular/i18n/angular-locale_en-dsrt.js | 1 + .../js/lib/angular/i18n/angular-locale_en-fm.js | 1 + .../js/lib/angular/i18n/angular-locale_en-gb.js | 1 + .../js/lib/angular/i18n/angular-locale_en-gu.js | 1 + .../js/lib/angular/i18n/angular-locale_en-gy.js | 1 + .../js/lib/angular/i18n/angular-locale_en-hk.js | 1 + .../js/lib/angular/i18n/angular-locale_en-ie.js | 1 + .../js/lib/angular/i18n/angular-locale_en-in.js | 1 + .../lib/angular/i18n/angular-locale_en-iso.js | 1 + .../js/lib/angular/i18n/angular-locale_en-jm.js | 1 + .../js/lib/angular/i18n/angular-locale_en-mh.js | 1 + .../js/lib/angular/i18n/angular-locale_en-mp.js | 1 + .../js/lib/angular/i18n/angular-locale_en-mt.js | 1 + .../js/lib/angular/i18n/angular-locale_en-mu.js | 1 + .../js/lib/angular/i18n/angular-locale_en-na.js | 1 + .../js/lib/angular/i18n/angular-locale_en-nz.js | 1 + .../js/lib/angular/i18n/angular-locale_en-ph.js | 1 + .../js/lib/angular/i18n/angular-locale_en-pk.js | 1 + .../js/lib/angular/i18n/angular-locale_en-pr.js | 1 + .../js/lib/angular/i18n/angular-locale_en-pw.js | 1 + .../js/lib/angular/i18n/angular-locale_en-sg.js | 1 + .../js/lib/angular/i18n/angular-locale_en-tc.js | 1 + .../js/lib/angular/i18n/angular-locale_en-tt.js | 1 + .../js/lib/angular/i18n/angular-locale_en-um.js | 1 + .../js/lib/angular/i18n/angular-locale_en-us.js | 1 + .../js/lib/angular/i18n/angular-locale_en-vg.js | 1 + .../js/lib/angular/i18n/angular-locale_en-vi.js | 1 + .../js/lib/angular/i18n/angular-locale_en-za.js | 1 + .../js/lib/angular/i18n/angular-locale_en-zw.js | 1 + .../js/lib/angular/i18n/angular-locale_en-zz.js | 4 - .../js/lib/angular/i18n/angular-locale_en.js | 1 + .../lib/angular/i18n/angular-locale_es-419.js | 1 + .../js/lib/angular/i18n/angular-locale_es-ar.js | 1 + .../js/lib/angular/i18n/angular-locale_es-bo.js | 1 + .../js/lib/angular/i18n/angular-locale_es-cl.js | 1 + .../js/lib/angular/i18n/angular-locale_es-co.js | 1 + .../js/lib/angular/i18n/angular-locale_es-cr.js | 1 + .../js/lib/angular/i18n/angular-locale_es-do.js | 1 + .../js/lib/angular/i18n/angular-locale_es-ea.js | 1 + .../js/lib/angular/i18n/angular-locale_es-ec.js | 1 + .../js/lib/angular/i18n/angular-locale_es-es.js | 1 + .../js/lib/angular/i18n/angular-locale_es-gq.js | 1 + .../js/lib/angular/i18n/angular-locale_es-gt.js | 1 + .../js/lib/angular/i18n/angular-locale_es-hn.js | 1 + .../js/lib/angular/i18n/angular-locale_es-ic.js | 1 + .../js/lib/angular/i18n/angular-locale_es-mx.js | 1 + .../js/lib/angular/i18n/angular-locale_es-ni.js | 1 + .../js/lib/angular/i18n/angular-locale_es-pa.js | 1 + .../js/lib/angular/i18n/angular-locale_es-pe.js | 1 + .../js/lib/angular/i18n/angular-locale_es-pr.js | 1 + .../js/lib/angular/i18n/angular-locale_es-py.js | 1 + .../js/lib/angular/i18n/angular-locale_es-sv.js | 1 + .../js/lib/angular/i18n/angular-locale_es-us.js | 1 + .../js/lib/angular/i18n/angular-locale_es-uy.js | 1 + .../js/lib/angular/i18n/angular-locale_es-ve.js | 1 + .../js/lib/angular/i18n/angular-locale_es.js | 1 + .../js/lib/angular/i18n/angular-locale_et-ee.js | 1 + .../js/lib/angular/i18n/angular-locale_et.js | 1 + .../js/lib/angular/i18n/angular-locale_eu-es.js | 1 + .../js/lib/angular/i18n/angular-locale_eu.js | 1 + .../js/lib/angular/i18n/angular-locale_fa-af.js | 1 + .../js/lib/angular/i18n/angular-locale_fa-ir.js | 1 + .../js/lib/angular/i18n/angular-locale_fa.js | 1 + .../js/lib/angular/i18n/angular-locale_fi-fi.js | 1 + .../js/lib/angular/i18n/angular-locale_fi.js | 1 + .../lib/angular/i18n/angular-locale_fil-ph.js | 1 + .../js/lib/angular/i18n/angular-locale_fil.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-be.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-bf.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-bi.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-bj.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-bl.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-ca.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-cd.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-cf.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-cg.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-ch.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-ci.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-cm.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-dj.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-fr.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-ga.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-gf.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-gn.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-gp.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-gq.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-km.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-lu.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-mc.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-mf.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-mg.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-ml.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-mq.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-ne.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-re.js | 1 + .../js/lib/angular/i18n/angular-locale_fr-rw.js | 109 +- .../js/lib/angular/i18n/angular-locale_fr-sn.js | 109 +- .../js/lib/angular/i18n/angular-locale_fr-td.js | 109 +- .../js/lib/angular/i18n/angular-locale_fr-tg.js | 117 +- .../js/lib/angular/i18n/angular-locale_fr-yt.js | 1 + .../js/lib/angular/i18n/angular-locale_fr.js | 1 + .../js/lib/angular/i18n/angular-locale_gl-es.js | 1 + .../js/lib/angular/i18n/angular-locale_gl.js | 1 + .../lib/angular/i18n/angular-locale_gsw-ch.js | 1 + .../js/lib/angular/i18n/angular-locale_gsw.js | 1 + .../js/lib/angular/i18n/angular-locale_gu-in.js | 1 + .../js/lib/angular/i18n/angular-locale_gu.js | 1 + .../js/lib/angular/i18n/angular-locale_haw.js | 4 - .../js/lib/angular/i18n/angular-locale_he-il.js | 1 + .../js/lib/angular/i18n/angular-locale_he.js | 1 + .../js/lib/angular/i18n/angular-locale_hi-in.js | 1 + .../js/lib/angular/i18n/angular-locale_hi.js | 1 + .../js/lib/angular/i18n/angular-locale_hr-hr.js | 1 + .../js/lib/angular/i18n/angular-locale_hr.js | 1 + .../js/lib/angular/i18n/angular-locale_hu-hu.js | 1 + .../js/lib/angular/i18n/angular-locale_hu.js | 1 + .../js/lib/angular/i18n/angular-locale_id-id.js | 1 + .../js/lib/angular/i18n/angular-locale_id.js | 1 + .../js/lib/angular/i18n/angular-locale_in.js | 1 + .../js/lib/angular/i18n/angular-locale_is-is.js | 1 + .../js/lib/angular/i18n/angular-locale_is.js | 1 + .../js/lib/angular/i18n/angular-locale_it-ch.js | 115 +- .../js/lib/angular/i18n/angular-locale_it-it.js | 1 + .../js/lib/angular/i18n/angular-locale_it-sm.js | 1 + .../js/lib/angular/i18n/angular-locale_it.js | 1 + .../js/lib/angular/i18n/angular-locale_iw.js | 1 + .../js/lib/angular/i18n/angular-locale_ja-jp.js | 1 + .../js/lib/angular/i18n/angular-locale_ja.js | 1 + .../js/lib/angular/i18n/angular-locale_kn-in.js | 1 + .../js/lib/angular/i18n/angular-locale_kn.js | 1 + .../js/lib/angular/i18n/angular-locale_ko-kr.js | 1 + .../js/lib/angular/i18n/angular-locale_ko.js | 1 + .../js/lib/angular/i18n/angular-locale_ln-cd.js | 1 + .../js/lib/angular/i18n/angular-locale_ln-cg.js | 113 +- .../js/lib/angular/i18n/angular-locale_ln.js | 1 + .../js/lib/angular/i18n/angular-locale_lt-lt.js | 1 + .../js/lib/angular/i18n/angular-locale_lt.js | 1 + .../js/lib/angular/i18n/angular-locale_lv-lv.js | 1 + .../js/lib/angular/i18n/angular-locale_lv.js | 1 + .../js/lib/angular/i18n/angular-locale_ml-in.js | 1 + .../js/lib/angular/i18n/angular-locale_ml.js | 1 + .../js/lib/angular/i18n/angular-locale_mo.js | 4 - .../js/lib/angular/i18n/angular-locale_mr-in.js | 1 + .../js/lib/angular/i18n/angular-locale_mr.js | 1 + .../js/lib/angular/i18n/angular-locale_ms-bn.js | 113 +- .../js/lib/angular/i18n/angular-locale_ms-my.js | 1 + .../js/lib/angular/i18n/angular-locale_ms.js | 1 + .../js/lib/angular/i18n/angular-locale_mt-mt.js | 1 + .../js/lib/angular/i18n/angular-locale_mt.js | 1 + .../js/lib/angular/i18n/angular-locale_nl-aw.js | 115 +- .../js/lib/angular/i18n/angular-locale_nl-be.js | 115 +- .../js/lib/angular/i18n/angular-locale_nl-cw.js | 1 + .../js/lib/angular/i18n/angular-locale_nl-nl.js | 1 + .../js/lib/angular/i18n/angular-locale_nl-sx.js | 1 + .../js/lib/angular/i18n/angular-locale_nl.js | 1 + .../js/lib/angular/i18n/angular-locale_no.js | 1 + .../js/lib/angular/i18n/angular-locale_or-in.js | 1 + .../js/lib/angular/i18n/angular-locale_or.js | 1 + .../js/lib/angular/i18n/angular-locale_pl-pl.js | 1 + .../js/lib/angular/i18n/angular-locale_pl.js | 1 + .../js/lib/angular/i18n/angular-locale_pt-ao.js | 113 +- .../js/lib/angular/i18n/angular-locale_pt-br.js | 1 + .../js/lib/angular/i18n/angular-locale_pt-gw.js | 113 +- .../js/lib/angular/i18n/angular-locale_pt-mz.js | 113 +- .../js/lib/angular/i18n/angular-locale_pt-pt.js | 1 + .../js/lib/angular/i18n/angular-locale_pt-st.js | 113 +- .../js/lib/angular/i18n/angular-locale_pt.js | 1 + .../js/lib/angular/i18n/angular-locale_ro-md.js | 113 +- .../js/lib/angular/i18n/angular-locale_ro-ro.js | 1 + .../js/lib/angular/i18n/angular-locale_ro.js | 1 + .../js/lib/angular/i18n/angular-locale_ru-md.js | 121 +- .../js/lib/angular/i18n/angular-locale_ru-ru.js | 1 + .../js/lib/angular/i18n/angular-locale_ru-ua.js | 119 +- .../js/lib/angular/i18n/angular-locale_ru.js | 1 + .../js/lib/angular/i18n/angular-locale_sk-sk.js | 1 + .../js/lib/angular/i18n/angular-locale_sk.js | 1 + .../js/lib/angular/i18n/angular-locale_sl-si.js | 1 + .../js/lib/angular/i18n/angular-locale_sl.js | 1 + .../js/lib/angular/i18n/angular-locale_sq-al.js | 1 + .../js/lib/angular/i18n/angular-locale_sq.js | 1 + .../angular/i18n/angular-locale_sr-cyrl-ba.js | 113 +- .../angular/i18n/angular-locale_sr-cyrl-me.js | 113 +- .../angular/i18n/angular-locale_sr-cyrl-rs.js | 1 + .../lib/angular/i18n/angular-locale_sr-cyrl.js | 113 +- .../angular/i18n/angular-locale_sr-latn-ba.js | 113 +- .../angular/i18n/angular-locale_sr-latn-me.js | 113 +- .../angular/i18n/angular-locale_sr-latn-rs.js | 1 + .../lib/angular/i18n/angular-locale_sr-latn.js | 113 +- .../js/lib/angular/i18n/angular-locale_sr-rs.js | 4 - .../js/lib/angular/i18n/angular-locale_sr.js | 1 + .../js/lib/angular/i18n/angular-locale_sv-fi.js | 115 +- .../js/lib/angular/i18n/angular-locale_sv-se.js | 1 + .../js/lib/angular/i18n/angular-locale_sv.js | 1 + .../js/lib/angular/i18n/angular-locale_sw-ke.js | 113 +- .../js/lib/angular/i18n/angular-locale_sw-tz.js | 1 + .../js/lib/angular/i18n/angular-locale_sw.js | 1 + .../js/lib/angular/i18n/angular-locale_ta-in.js | 1 + .../js/lib/angular/i18n/angular-locale_ta-lk.js | 115 +- .../js/lib/angular/i18n/angular-locale_ta.js | 1 + .../js/lib/angular/i18n/angular-locale_te-in.js | 1 + .../js/lib/angular/i18n/angular-locale_te.js | 1 + .../js/lib/angular/i18n/angular-locale_th-th.js | 1 + .../js/lib/angular/i18n/angular-locale_th.js | 1 + .../js/lib/angular/i18n/angular-locale_tl-ph.js | 4 - .../js/lib/angular/i18n/angular-locale_tl.js | 1 + .../js/lib/angular/i18n/angular-locale_tr-tr.js | 1 + .../js/lib/angular/i18n/angular-locale_tr.js | 1 + .../js/lib/angular/i18n/angular-locale_uk-ua.js | 1 + .../js/lib/angular/i18n/angular-locale_uk.js | 1 + .../js/lib/angular/i18n/angular-locale_ur-in.js | 121 +- .../js/lib/angular/i18n/angular-locale_ur-pk.js | 1 + .../js/lib/angular/i18n/angular-locale_ur.js | 1 + .../js/lib/angular/i18n/angular-locale_vi-vn.js | 1 + .../js/lib/angular/i18n/angular-locale_vi.js | 1 + .../js/lib/angular/i18n/angular-locale_zh-cn.js | 1 + .../angular/i18n/angular-locale_zh-hans-cn.js | 1 + .../angular/i18n/angular-locale_zh-hans-hk.js | 123 +- .../angular/i18n/angular-locale_zh-hans-mo.js | 123 +- .../angular/i18n/angular-locale_zh-hans-sg.js | 123 +- .../lib/angular/i18n/angular-locale_zh-hans.js | 119 +- .../angular/i18n/angular-locale_zh-hant-hk.js | 127 +- .../angular/i18n/angular-locale_zh-hant-mo.js | 127 +- .../angular/i18n/angular-locale_zh-hant-tw.js | 119 +- .../lib/angular/i18n/angular-locale_zh-hant.js | 119 +- .../js/lib/angular/i18n/angular-locale_zh-hk.js | 1 + .../js/lib/angular/i18n/angular-locale_zh-tw.js | 1 + .../js/lib/angular/i18n/angular-locale_zh.js | 1 + .../js/lib/angular/i18n/angular-locale_zu-za.js | 1 + .../js/lib/angular/i18n/angular-locale_zu.js | 1 + .../src/main/webapp/js/lib/angular/version.json | 2 +- .../src/main/webapp/js/lib/angular/version.txt | 2 +- archetypes/struts2-archetype-blank/pom.xml | 3 +- .../src/main/resources/example.xml | 6 +- .../main/webapp/WEB-INF/example/HelloWorld.jsp | 28 + .../src/main/webapp/WEB-INF/example/Login.jsp | 15 + .../src/main/webapp/WEB-INF/example/Menu.jsp | 3 + .../src/main/webapp/WEB-INF/example/Missing.jsp | 11 + .../main/webapp/WEB-INF/example/Register.jsp | 3 + .../src/main/webapp/WEB-INF/example/Welcome.jsp | 18 + .../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 - archetypes/struts2-archetype-convention/pom.xml | 3 +- archetypes/struts2-archetype-dbportlet/pom.xml | 3 +- archetypes/struts2-archetype-plugin/pom.xml | 3 +- archetypes/struts2-archetype-portlet/pom.xml | 3 +- archetypes/struts2-archetype-starter/pom.xml | 3 +- .../src/main/resources/struts.xml | 4 +- .../src/main/webapp/WEB-INF/jsp/helloWorld.jsp | 16 + .../src/main/webapp/WEB-INF/jsp/index.jsp | 20 + .../src/main/webapp/jsp/helloWorld.jsp | 16 - .../src/main/webapp/jsp/index.jsp | 20 - assembly/pom.xml | 2 +- bom/pom.xml | 184 + bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 14 +- .../org/apache/struts2/StrutsConstants.java | 28 +- .../org/apache/struts2/components/Checkbox.java | 10 + .../apache/struts2/components/CheckboxList.java | 19 +- .../apache/struts2/components/Component.java | 44 + .../apache/struts2/components/ListUIBean.java | 22 + .../org/apache/struts2/components/Radio.java | 18 +- .../struts2/components/ServletUrlRenderer.java | 287 +- .../org/apache/struts2/components/UIBean.java | 61 +- .../struts2/components/template/Template.java | 23 + .../config/DefaultBeanSelectionProvider.java | 30 +- .../apache/struts2/dispatcher/Dispatcher.java | 3 + .../dispatcher/ServletRedirectResult.java | 39 +- .../apache/struts2/dispatcher/SessionMap.java | 19 +- .../multipart/JakartaMultiPartRequest.java | 19 +- .../JakartaStreamMultiPartRequest.java | 598 + .../struts2/interceptor/CookieInterceptor.java | 48 +- .../interceptor/FileUploadInterceptor.java | 7 +- .../TokenSessionStoreInterceptor.java | 2 +- .../AnnotationValidationInterceptor.java | 19 +- .../struts2/util/FastByteArrayOutputStream.java | 2 + .../apache/struts2/views/DefaultTagLibrary.java | 10 +- .../org/apache/struts2/views/TagLibrary.java | 57 + .../views/freemarker/FreemarkerManager.java | 15 + .../views/freemarker/FreemarkerResult.java | 5 +- .../FreemarkerThemeTemplateLoader.java | 2 +- .../struts2/views/jsp/ui/AbstractListTag.java | 12 + .../struts2/views/jsp/ui/AbstractUITag.java | 14 +- .../views/jsp/ui/AbstractUITagBeanInfo.java | 70 + .../struts2/views/velocity/VelocityManager.java | 16 + .../apache/struts2/views/xslt/XSLTResult.java | 12 + .../org/apache/struts2/default.properties | 6 + .../struts2/interceptor/debugging/browser.ftl | 21 +- .../struts2/interceptor/debugging/console.ftl | 4 +- .../interceptor/debugging/webconsole.html | 30 +- .../struts2/interceptor/debugging/webconsole.js | 99 +- .../struts2/static/optiontransferselect.js | 12 +- .../apache/struts2/struts-messages.properties | 2 +- core/src/main/resources/struts-default.xml | 22 + .../main/resources/template/simple/checkbox.ftl | 14 +- .../resources/template/simple/checkboxlist.ftl | 34 +- .../template/simple/common-attributes.ftl | 2 +- core/src/main/resources/template/simple/css.ftl | 8 +- .../resources/template/simple/doubleselect.ftl | 40 +- .../template/simple/dynamic-attributes.ftl | 2 +- .../resources/template/simple/fielderror.ftl | 12 +- .../src/main/resources/template/simple/file.ftl | 14 +- .../resources/template/simple/form-common.ftl | 28 +- .../src/main/resources/template/simple/form.ftl | 4 +- .../main/resources/template/simple/hidden.ftl | 10 +- .../template/simple/inputtransferselect.ftl | 48 +- .../main/resources/template/simple/label.ftl | 12 +- .../main/resources/template/simple/optgroup.ftl | 6 +- .../main/resources/template/simple/password.ftl | 18 +- .../main/resources/template/simple/radiomap.ftl | 27 +- .../main/resources/template/simple/reset.ftl | 26 +- .../main/resources/template/simple/select.ftl | 37 +- .../main/resources/template/simple/submit.ftl | 34 +- .../src/main/resources/template/simple/text.ftl | 18 +- .../main/resources/template/simple/textarea.ftl | 20 +- core/src/site/resources/tags/a.html | 16 + core/src/site/resources/tags/actionerror.html | 16 + core/src/site/resources/tags/actionmessage.html | 16 + core/src/site/resources/tags/ajax/a.html | 8 + .../site/resources/tags/ajax/autocompleter.html | 8 + .../resources/tags/ajax/datetimepicker.html | 8 + core/src/site/resources/tags/ajax/div.html | 8 + core/src/site/resources/tags/ajax/submit.html | 8 + .../site/resources/tags/ajax/tabbedpanel.html | 8 + core/src/site/resources/tags/ajax/textarea.html | 8 + core/src/site/resources/tags/ajax/tree.html | 8 + core/src/site/resources/tags/ajax/treenode.html | 8 + core/src/site/resources/tags/checkbox.html | 24 + core/src/site/resources/tags/checkboxlist.html | 40 + core/src/site/resources/tags/combobox.html | 16 + core/src/site/resources/tags/component.html | 16 + core/src/site/resources/tags/datetextfield.html | 16 + core/src/site/resources/tags/debug.html | 16 + core/src/site/resources/tags/div.html | 16 + core/src/site/resources/tags/doubleselect.html | 32 + core/src/site/resources/tags/fielderror.html | 16 + core/src/site/resources/tags/file.html | 16 + core/src/site/resources/tags/form.html | 16 + core/src/site/resources/tags/head.html | 16 + core/src/site/resources/tags/hidden.html | 16 + .../resources/tags/inputtransferselect.html | 32 + core/src/site/resources/tags/label.html | 16 + .../resources/tags/optiontransferselect.html | 32 + core/src/site/resources/tags/password.html | 16 + core/src/site/resources/tags/radio.html | 40 + core/src/site/resources/tags/reset.html | 16 + core/src/site/resources/tags/select.html | 32 + core/src/site/resources/tags/submit.html | 16 + core/src/site/resources/tags/textarea.html | 16 + core/src/site/resources/tags/textfield.html | 16 + core/src/site/resources/tags/token.html | 16 + core/src/site/resources/tags/updownselect.html | 32 + .../struts2/TestConfigurationProvider.java | 5 + .../DefaultBeanSelectionProviderTest.java | 3 +- .../struts2/dispatcher/DispatcherTest.java | 2 - .../dispatcher/ServletRedirectResultTest.java | 1 + .../struts2/dispatcher/SessionMapTest.java | 1 + .../interceptor/CookieInterceptorTest.java | 11 + .../ExecuteAndWaitInterceptorTest.java | 2 + .../FreemarkerThemeTemplateLoaderTest.java | 66 + .../struts2/views/jsp/PropertyTagTest.java | 30 +- .../views/jsp/StrutsMockHttpSession.java | 7 + .../apache/struts2/views/jsp/ui/AnchorTest.java | 15 +- .../struts2/views/jsp/ui/ComponentTest.java | 16 +- .../views/jsp/ui/LocaleKeyValueTest.java | 11 + .../struts2/views/jsp/ui/LocaleTestAction.java | 17 + .../struts2/views/jsp/ui/OptGroupTest.java | 73 +- .../apache/struts2/views/jsp/ui/SelectTest.java | 2 +- .../struts2/views/xslt/XSLTResultTest.java | 11 + .../struts2/views/jsp/ui/Component-param.txt | 2 +- .../apache/struts2/views/jsp/ui/OptGroup-6.txt | 40 + .../apache/struts2/views/jsp/ui/OptGroup-7.txt | 43 + .../test/resources/template/test/Component.ftl | 2 +- plugins/cdi/pom.xml | 2 +- .../apache/struts2/cdi/CdiObjectFactory.java | 9 + plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- .../convention/ConventionUnknownHandler.java | 2 +- .../PackageBasedActionConfigBuilder.java | 53 +- plugins/dojo/pom.xml | 2 +- .../dojo/views/jsp/ui/TabbedPanelTag.java | 2 +- .../apache/struts2/static/dojo/struts_dojo.js | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- .../jasperreports/JasperReportsResult.java | 32 +- .../jasperreports/ValueStackDataSource.java | 21 +- plugins/javatemplates/pom.xml | 2 +- .../apache/struts2/views/java/DefaultTheme.java | 6 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- .../org/apache/struts2/json/JSONUtilTest.java | 14 + .../java/org/apache/struts2/json/ListBean.java | 24 + plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- .../OValValidationInterceptorTest.java | 1 - plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- .../portlet/context/PortletActionContext.java | 14 + .../freemarker/PortletFreemarkerResult.java | 37 +- plugins/rest/pom.xml | 4 +- .../struts2/rest/RestActionInvocationTest.java | 2 + plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- .../spring/StrutsSpringObjectFactory.java | 3 + .../spring/StrutsSpringObjectFactoryTest.java | 4 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 19 +- xwork-core/pom.xml | 11 +- .../xwork2/DefaultActionInvocation.java | 48 +- .../xwork2/DefaultUnknownHandlerManager.java | 30 +- .../opensymphony/xwork2/ExcludedPatterns.java | 22 - .../com/opensymphony/xwork2/ObjectFactory.java | 19 + .../com/opensymphony/xwork2/UnknownHandler.java | 4 +- .../com/opensymphony/xwork2/XWorkConstants.java | 10 + .../xwork2/config/entities/ActionConfig.java | 1 + .../config/entities/ExceptionMappingConfig.java | 1 + .../config/entities/InterceptorConfig.java | 1 + .../config/entities/InterceptorStackConfig.java | 1 + .../xwork2/config/entities/PackageConfig.java | 1 + .../xwork2/config/entities/ResultConfig.java | 1 + .../config/entities/ResultTypeConfig.java | 1 + .../config/entities/UnknownHandlerConfig.java | 8 +- .../config/impl/DefaultConfiguration.java | 6 +- .../providers/XWorkConfigurationProvider.java | 14 +- .../providers/XmlConfigurationProvider.java | 14 +- .../conversion/impl/DefaultTypeConverter.java | 20 +- .../impl/InstantiatingNullHandler.java | 4 +- .../xwork2/conversion/impl/NumberConverter.java | 2 + .../xwork2/conversion/impl/XWorkConverter.java | 11 +- .../factory/DefaultUnknownHandlerFactory.java | 25 + .../xwork2/factory/UnknownHandlerFactory.java | 21 + .../interceptor/ParametersInterceptor.java | 143 +- .../opensymphony/xwork2/mock/MockResult.java | 7 + .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 83 +- .../xwork2/ognl/OgnlValueStack.java | 10 +- .../xwork2/ognl/SecurityMemberAccess.java | 93 +- .../ognl/accessor/CompoundRootAccessor.java | 3 +- .../XWorkCollectionPropertyAccessor.java | 50 +- .../security/AcceptedPatternsChecker.java | 82 + .../DefaultAcceptedPatternsChecker.java | 84 + .../DefaultExcludedPatternsChecker.java | 93 + .../security/ExcludedPatternsChecker.java | 82 + .../xwork2/spring/SpringObjectFactory.java | 15 + .../xwork2/util/LocalizedTextUtil.java | 119 +- .../util/NamedVariablePatternMatcher.java | 5 +- .../xwork2/util/finder/ClassFinder.java | 42 +- .../xwork2/util/finder/ResourceFinder.java | 7 +- .../xwork2/util/location/LocationUtils.java | 12 +- .../xwork2/util/logging/Logger.java | 6 + .../util/logging/commons/CommonsLogger.java | 8 + .../xwork2/util/logging/jdk/JdkLogger.java | 8 + .../xwork2/util/logging/slf4j/Slf4jLogger.java | 8 + .../AnnotationActionValidatorManager.java | 42 +- .../DefaultActionValidatorManager.java | 49 +- .../validators/AbstractRangeValidator.java | 110 - .../validators/DateRangeFieldValidator.java | 2 +- .../validators/IntRangeFieldValidator.java | 2 +- .../validators/LongRangeFieldValidator.java | 2 +- .../validators/RangeValidatorSupport.java | 106 + .../validators/RegexFieldValidator.java | 2 +- .../validators/ShortRangeFieldValidator.java | 2 +- .../validators/VisitorFieldValidator.java | 13 +- .../xwork2/DefaultActionInvocationTest.java | 8 + .../impl/AnnotationXWorkConverterTest.java | 10 +- .../interceptor/ParametersInterceptorTest.java | 47 +- .../opensymphony/xwork2/ognl/OgnlUtilTest.java | 174 +- .../xwork2/ognl/OgnlValueStackTest.java | 16 + .../xwork2/ognl/SecurityMemberAccessTest.java | 252 + .../DefaultAcceptedPatternsCheckerTest.java | 67 + .../DefaultExcludedPatternsCheckerTest.java | 103 + .../xwork2/util/LocalizedTextUtilTest.java | 7 - .../util/NamedVariablePatternMatcherTest.java | 22 +- .../validator/DateRangeValidatorTest.java | 6 - .../validator/DoubleRangeValidatorTest.java | 12 - .../validator/SimpleActionValidationTest.java | 9 - .../VisitorFieldValidatorModelTest.java | 6 - .../validator/VisitorFieldValidatorTest.java | 32 +- .../AppendingValidatorContextTest.java | 47 + .../validators/DateRangeFieldValidatorTest.java | 12 +- .../xwork2/TestChildBean-validation.xml | 21 +- xwork-core/src/test/resources/log4j.properties | 13 +- .../test/resources/xwork-class-param-test.xml | 11 + .../src/test/resources/xwork-param-test.xml | 1 + .../src/test/resources/xwork-test-beans.xml | 24 +- 635 files changed, 51155 insertions(+), 31114 deletions(-) ----------------------------------------------------------------------
