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/09/28 20:43:25 UTC

[7/8] struts git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/db62a57b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/db62a57b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/db62a57b

Branch: refs/heads/master
Commit: db62a57bcb174a288a4cd706f4ade7875a332846
Parents: dc270c2 18fc7eb
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Sep 23 08:56:51 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Sep 23 08:56:51 2015 +0200

----------------------------------------------------------------------
 .../WEB-INF/content/orders-deleteConfirm.jsp    |    2 +
 .../main/webapp/WEB-INF/content/orders-edit.jsp |    8 +
 .../webapp/WEB-INF/content/orders-editNew.jsp   |    9 +-
 .../webapp/WEB-INF/content/orders-index.jsp     |    2 +
 .../main/webapp/WEB-INF/content/orders-show.jsp |    2 +
 apps/rest-showcase/src/main/webapp/css/app.css  |    5 +
 .../webapp/js/lib/angular/angular-animate.js    |  773 ++++++++-----
 .../js/lib/angular/angular-animate.min.js       |   98 +-
 .../js/lib/angular/angular-animate.min.js.map   |    6 +-
 .../main/webapp/js/lib/angular/angular-aria.js  |    2 +-
 .../webapp/js/lib/angular/angular-aria.min.js   |    2 +-
 .../webapp/js/lib/angular/angular-cookies.js    |    4 +-
 .../js/lib/angular/angular-cookies.min.js       |    2 +-
 .../webapp/js/lib/angular/angular-loader.js     |    9 +-
 .../webapp/js/lib/angular/angular-loader.min.js |    9 +-
 .../js/lib/angular/angular-loader.min.js.map    |    6 +-
 .../js/lib/angular/angular-message-format.js    |    2 +-
 .../lib/angular/angular-message-format.min.js   |    2 +-
 .../webapp/js/lib/angular/angular-messages.js   |    2 +-
 .../js/lib/angular/angular-messages.min.js      |    2 +-
 .../main/webapp/js/lib/angular/angular-mocks.js |  104 +-
 .../webapp/js/lib/angular/angular-resource.js   |   12 +-
 .../js/lib/angular/angular-resource.min.js      |   16 +-
 .../js/lib/angular/angular-resource.min.js.map  |    4 +-
 .../main/webapp/js/lib/angular/angular-route.js |    7 +-
 .../webapp/js/lib/angular/angular-route.min.js  |    2 +-
 .../js/lib/angular/angular-route.min.js.map     |    2 +-
 .../webapp/js/lib/angular/angular-sanitize.js   |    4 +-
 .../js/lib/angular/angular-sanitize.min.js      |    2 +-
 .../webapp/js/lib/angular/angular-scenario.js   | 1068 +++++++++++------
 .../main/webapp/js/lib/angular/angular-touch.js |    2 +-
 .../webapp/js/lib/angular/angular-touch.min.js  |    2 +-
 .../src/main/webapp/js/lib/angular/angular.js   | 1070 ++++++++++++------
 .../main/webapp/js/lib/angular/angular.min.js   |  559 ++++-----
 .../webapp/js/lib/angular/angular.min.js.map    |    6 +-
 .../src/main/webapp/js/lib/angular/errors.json  |    2 +-
 .../js/lib/angular/i18n/angular-locale_af-na.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_af-za.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_af.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ak-gh.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ak.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_am-et.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_am.js    |    2 +-
 .../lib/angular/i18n/angular-locale_ar-001.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-ae.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-bh.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-dj.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-dz.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_ar-eg.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-eh.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-er.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-il.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-iq.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-jo.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-km.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-kw.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-lb.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_ar-ly.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-ma.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_ar-mr.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-om.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-ps.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-qa.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_ar-sa.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_ar-sd.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-so.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-ss.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_ar-sy.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_ar-td.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ar-tn.js |   16 +-
 .../js/lib/angular/i18n/angular-locale_ar-ye.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_ar.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_as-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_as.js    |    2 +-
 .../angular/i18n/angular-locale_az-cyrl-az.js   |    2 +-
 .../lib/angular/i18n/angular-locale_az-cyrl.js  |    4 +-
 .../angular/i18n/angular-locale_az-latn-az.js   |    2 +-
 .../lib/angular/i18n/angular-locale_az-latn.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_az.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_be-by.js |   22 +-
 .../js/lib/angular/i18n/angular-locale_be.js    |   22 +-
 .../lib/angular/i18n/angular-locale_bem-zm.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_bem.js   |    2 +-
 .../angular/i18n/angular-locale_bm-latn-ml.js   |    2 +-
 .../lib/angular/i18n/angular-locale_bm-latn.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_bm.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_bo-cn.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_bo-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_bo.js    |    2 +-
 .../lib/angular/i18n/angular-locale_brx-in.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_brx.js   |    2 +-
 .../angular/i18n/angular-locale_bs-cyrl-ba.js   |    2 +-
 .../lib/angular/i18n/angular-locale_bs-cyrl.js  |    4 +-
 .../angular/i18n/angular-locale_bs-latn-ba.js   |    2 +-
 .../lib/angular/i18n/angular-locale_bs-latn.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_bs.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ca-ad.js |   24 +-
 .../i18n/angular-locale_ca-es-valencia.js       |   24 +-
 .../js/lib/angular/i18n/angular-locale_ca-es.js |   24 +-
 .../js/lib/angular/i18n/angular-locale_ca-fr.js |   24 +-
 .../js/lib/angular/i18n/angular-locale_ca-it.js |   24 +-
 .../js/lib/angular/i18n/angular-locale_ca.js    |   24 +-
 .../lib/angular/i18n/angular-locale_cgg-ug.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_cgg.js   |    2 +-
 .../lib/angular/i18n/angular-locale_chr-us.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_chr.js   |    2 +-
 .../angular/i18n/angular-locale_ckb-arab-iq.js  |    2 +-
 .../angular/i18n/angular-locale_ckb-arab-ir.js  |    2 +-
 .../lib/angular/i18n/angular-locale_ckb-arab.js |    4 +-
 .../lib/angular/i18n/angular-locale_ckb-iq.js   |    2 +-
 .../lib/angular/i18n/angular-locale_ckb-ir.js   |    2 +-
 .../angular/i18n/angular-locale_ckb-latn-iq.js  |    2 +-
 .../lib/angular/i18n/angular-locale_ckb-latn.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_ckb.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_cs-cz.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_cs.js    |    4 +-
 .../js/lib/angular/i18n/angular-locale_cy-gb.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_cy.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_da-dk.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_da-gl.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_da.js    |    8 +-
 .../lib/angular/i18n/angular-locale_dav-ke.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_dav.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_de-at.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_de-li.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_dz-bt.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_dz.js    |    2 +-
 .../lib/angular/i18n/angular-locale_ebu-ke.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_ebu.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_ee-gh.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ee-tg.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ee.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_el-cy.js |    8 +-
 .../lib/angular/i18n/angular-locale_en-001.js   |   14 +-
 .../lib/angular/i18n/angular-locale_en-150.js   |   16 +-
 .../js/lib/angular/i18n/angular-locale_en-ag.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ai.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-as.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-au.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_en-bb.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-be.js |   16 +-
 .../js/lib/angular/i18n/angular-locale_en-bm.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-bs.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-bw.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_en-bz.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_en-ca.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-cc.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ck.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-cm.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-cx.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-dg.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-dm.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-er.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-fj.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-fk.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-fm.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-gb.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_en-gd.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-gg.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-gh.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-gi.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-gm.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-gu.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-gy.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-hk.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_en-ie.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_en-im.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-in.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_en-io.js |   14 +-
 .../lib/angular/i18n/angular-locale_en-iso.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-je.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-jm.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_en-ke.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ki.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-kn.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ky.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-lc.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-lr.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ls.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-mg.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-mh.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-mo.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-mp.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-ms.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-mt.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-mu.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-mw.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-my.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-na.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-nf.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ng.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-nr.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-nu.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-nz.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_en-pg.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ph.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-pk.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-pn.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-pr.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-pw.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-rw.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-sb.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-sc.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-sd.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-sg.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_en-sh.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-sl.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ss.js |   16 +-
 .../js/lib/angular/i18n/angular-locale_en-sx.js |   16 +-
 .../js/lib/angular/i18n/angular-locale_en-sz.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-tc.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-tk.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-to.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-tt.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-tv.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-tz.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ug.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-um.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-us.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-vc.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-vg.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-vi.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_en-vu.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-ws.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-za.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_en-zm.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_en-zw.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_en.js    |    2 +-
 .../lib/angular/i18n/angular-locale_eo-001.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_eo.js    |    2 +-
 .../lib/angular/i18n/angular-locale_es-419.js   |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-ar.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-bo.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-cl.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_es-co.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_es-cr.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-cu.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-do.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-ea.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_es-ec.js |   12 +-
 .../js/lib/angular/i18n/angular-locale_es-es.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_es-gq.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_es-gt.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_es-hn.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-ic.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_es-mx.js |   30 +-
 .../js/lib/angular/i18n/angular-locale_es-ni.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-pa.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_es-pe.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_es-ph.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_es-pr.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_es-py.js |   12 +-
 .../js/lib/angular/i18n/angular-locale_es-sv.js |   14 +-
 .../js/lib/angular/i18n/angular-locale_es-us.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_es-uy.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_es-ve.js |   12 +-
 .../js/lib/angular/i18n/angular-locale_es.js    |    6 +-
 .../js/lib/angular/i18n/angular-locale_fa-af.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_fa-ir.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_fa.js    |    2 +-
 .../lib/angular/i18n/angular-locale_fil-ph.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_fil.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_fr-ca.js |    4 +-
 .../lib/angular/i18n/angular-locale_fur-it.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_fur.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_ga-ie.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ga.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_gd-gb.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_gd.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_gl-es.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_gl.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_gu-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_gu.js    |    2 +-
 .../lib/angular/i18n/angular-locale_guz-ke.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_guz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_gv-im.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_gv.js    |    2 +-
 .../angular/i18n/angular-locale_ha-latn-gh.js   |    2 +-
 .../angular/i18n/angular-locale_ha-latn-ne.js   |    2 +-
 .../angular/i18n/angular-locale_ha-latn-ng.js   |    2 +-
 .../lib/angular/i18n/angular-locale_ha-latn.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_ha.js    |    2 +-
 .../lib/angular/i18n/angular-locale_haw-us.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_haw.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_he-il.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_he.js    |    8 +-
 .../js/lib/angular/i18n/angular-locale_hi-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_hi.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_id-id.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_id.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ig-ng.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ig.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ii-cn.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ii.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_in.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_iw.js    |    8 +-
 .../js/lib/angular/i18n/angular-locale_ja-jp.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ja.js    |    2 +-
 .../lib/angular/i18n/angular-locale_jgo-cm.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_jgo.js   |    2 +-
 .../lib/angular/i18n/angular-locale_jmc-tz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_jmc.js   |    2 +-
 .../lib/angular/i18n/angular-locale_kam-ke.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_kam.js   |    2 +-
 .../lib/angular/i18n/angular-locale_kde-tz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_kde.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_ki-ke.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ki.js    |    2 +-
 .../lib/angular/i18n/angular-locale_kk-cyrl.js  |    2 +-
 .../lib/angular/i18n/angular-locale_kkj-cm.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_kkj.js   |    2 +-
 .../lib/angular/i18n/angular-locale_kln-ke.js   |   72 +-
 .../js/lib/angular/i18n/angular-locale_kln.js   |   72 +-
 .../js/lib/angular/i18n/angular-locale_km-kh.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_km.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_kn-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_kn.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ko-kp.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ko-kr.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ko.js    |    2 +-
 .../lib/angular/i18n/angular-locale_kok-in.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_kok.js   |    2 +-
 .../angular/i18n/angular-locale_ks-arab-in.js   |    2 +-
 .../lib/angular/i18n/angular-locale_ks-arab.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_ks.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_kw-gb.js |   46 +-
 .../js/lib/angular/i18n/angular-locale_kw.js    |   46 +-
 .../lib/angular/i18n/angular-locale_ky-cyrl.js  |    2 +-
 .../lib/angular/i18n/angular-locale_lag-tz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_lag.js   |    2 +-
 .../lib/angular/i18n/angular-locale_lkt-us.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_lkt.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_lv-lv.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_lv.js    |    2 +-
 .../lib/angular/i18n/angular-locale_mas-ke.js   |    2 +-
 .../lib/angular/i18n/angular-locale_mas-tz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mas.js   |    2 +-
 .../lib/angular/i18n/angular-locale_mer-ke.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mer.js   |    2 +-
 .../lib/angular/i18n/angular-locale_mfe-mu.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mfe.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mg-mg.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_mg.js    |    2 +-
 .../lib/angular/i18n/angular-locale_mgh-mz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mgh.js   |    2 +-
 .../lib/angular/i18n/angular-locale_mgo-cm.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mgo.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mk-mk.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_mk.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ml-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ml.js    |    2 +-
 .../angular/i18n/angular-locale_mn-cyrl-mn.js   |    2 +-
 .../lib/angular/i18n/angular-locale_mn-cyrl.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_mn.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_mr-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_mr.js    |    2 +-
 .../angular/i18n/angular-locale_ms-latn-bn.js   |    2 +-
 .../angular/i18n/angular-locale_ms-latn-my.js   |    2 +-
 .../angular/i18n/angular-locale_ms-latn-sg.js   |    2 +-
 .../lib/angular/i18n/angular-locale_ms-latn.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_ms.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_mt-mt.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_mt.js    |    2 +-
 .../lib/angular/i18n/angular-locale_mua-cm.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_mua.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_my-mm.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_my.js    |    4 +-
 .../lib/angular/i18n/angular-locale_naq-na.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_naq.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_nb-no.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_nb-sj.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_nb.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_nd-zw.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_nd.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ne-in.js |   24 +-
 .../js/lib/angular/i18n/angular-locale_ne-np.js |   10 +-
 .../js/lib/angular/i18n/angular-locale_ne.js    |   10 +-
 .../js/lib/angular/i18n/angular-locale_nl-aw.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_nl-be.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_nl-bq.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_nl-cw.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_nl-nl.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_nl-sr.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_nl-sx.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_nl.js    |    4 +-
 .../lib/angular/i18n/angular-locale_nnh-cm.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_nnh.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_no-no.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_no.js    |    2 +-
 .../lib/angular/i18n/angular-locale_nus-sd.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_nus.js   |    2 +-
 .../lib/angular/i18n/angular-locale_nyn-ug.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_nyn.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_om-et.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_om-ke.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_om.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_or-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_or.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_os-ge.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_os-ru.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_os.js    |    2 +-
 .../angular/i18n/angular-locale_pa-arab-pk.js   |    2 +-
 .../lib/angular/i18n/angular-locale_pa-arab.js  |    2 +-
 .../angular/i18n/angular-locale_pa-guru-in.js   |    2 +-
 .../lib/angular/i18n/angular-locale_pa-guru.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_pa.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_pl-pl.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_pl.js    |    4 +-
 .../js/lib/angular/i18n/angular-locale_pt-br.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_pt.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_qu-bo.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_qu-ec.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_qu-pe.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_qu.js    |    2 +-
 .../lib/angular/i18n/angular-locale_rof-tz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_rof.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_ru-ua.js |    6 +-
 .../js/lib/angular/i18n/angular-locale_rw-rw.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_rw.js    |    2 +-
 .../lib/angular/i18n/angular-locale_sah-ru.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_sah.js   |    2 +-
 .../lib/angular/i18n/angular-locale_saq-ke.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_saq.js   |    2 +-
 .../lib/angular/i18n/angular-locale_shi-latn.js |    2 +-
 .../lib/angular/i18n/angular-locale_shi-tfng.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_si-lk.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_si.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_sl-si.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_sl.js    |    8 +-
 .../lib/angular/i18n/angular-locale_smn-fi.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_smn.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_sn-zw.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_sn.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_so-dj.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_so-et.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_so-ke.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_so-so.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_so.js    |    2 +-
 .../angular/i18n/angular-locale_sr-cyrl-ba.js   |   16 +-
 .../lib/angular/i18n/angular-locale_sr-cyrl.js  |    2 +-
 .../angular/i18n/angular-locale_sr-latn-ba.js   |   16 +-
 .../js/lib/angular/i18n/angular-locale_sv-fi.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_sw-cd.js |  128 +++
 .../js/lib/angular/i18n/angular-locale_sw-ke.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_sw-tz.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_sw-ug.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_sw.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ta-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ta-lk.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ta-my.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ta-sg.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ta.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_te-in.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_te.js    |    2 +-
 .../lib/angular/i18n/angular-locale_teo-ke.js   |    2 +-
 .../lib/angular/i18n/angular-locale_teo-ug.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_teo.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_th-th.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_th.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ti-er.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ti-et.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ti.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_tl.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_to-to.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_to.js    |    2 +-
 .../lib/angular/i18n/angular-locale_tzm-latn.js |    2 +-
 .../angular/i18n/angular-locale_ug-arab-cn.js   |    2 +-
 .../lib/angular/i18n/angular-locale_ug-arab.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_ug.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_ur-in.js |    8 +-
 .../js/lib/angular/i18n/angular-locale_ur-pk.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_ur.js    |    2 +-
 .../angular/i18n/angular-locale_uz-cyrl-uz.js   |    2 +-
 .../lib/angular/i18n/angular-locale_uz-cyrl.js  |    4 +-
 .../angular/i18n/angular-locale_uz-latn-uz.js   |    2 +-
 .../lib/angular/i18n/angular-locale_uz-latn.js  |    4 +-
 .../js/lib/angular/i18n/angular-locale_uz.js    |    2 +-
 .../angular/i18n/angular-locale_vai-latn-lr.js  |    2 +-
 .../lib/angular/i18n/angular-locale_vai-latn.js |    4 +-
 .../angular/i18n/angular-locale_vai-vaii-lr.js  |    2 +-
 .../lib/angular/i18n/angular-locale_vai-vaii.js |    4 +-
 .../js/lib/angular/i18n/angular-locale_vai.js   |    2 +-
 .../lib/angular/i18n/angular-locale_vun-tz.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_vun.js   |    2 +-
 .../lib/angular/i18n/angular-locale_wae-ch.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_wae.js   |    2 +-
 .../lib/angular/i18n/angular-locale_yi-001.js   |    2 +-
 .../js/lib/angular/i18n/angular-locale_yi.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_yo-bj.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_yo-ng.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_yo.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_zh-cn.js |    2 +-
 .../angular/i18n/angular-locale_zh-hans-cn.js   |    2 +-
 .../angular/i18n/angular-locale_zh-hans-hk.js   |    2 +-
 .../angular/i18n/angular-locale_zh-hans-mo.js   |    2 +-
 .../angular/i18n/angular-locale_zh-hans-sg.js   |    6 +-
 .../lib/angular/i18n/angular-locale_zh-hans.js  |    4 +-
 .../angular/i18n/angular-locale_zh-hant-hk.js   |    2 +-
 .../angular/i18n/angular-locale_zh-hant-mo.js   |   10 +-
 .../angular/i18n/angular-locale_zh-hant-tw.js   |    2 +-
 .../lib/angular/i18n/angular-locale_zh-hant.js  |    2 +-
 .../js/lib/angular/i18n/angular-locale_zh-hk.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_zh-tw.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_zh.js    |    2 +-
 .../js/lib/angular/i18n/angular-locale_zu-za.js |    2 +-
 .../js/lib/angular/i18n/angular-locale_zu.js    |    2 +-
 .../src/main/webapp/js/lib/angular/version.json |    2 +-
 .../src/main/webapp/js/lib/angular/version.txt  |    2 +-
 .../src/main/webapp/js/services/DataService.js  |   33 +-
 .../org/apache/struts2/util/ContainUtil.java    |    4 +-
 .../apache/struts2/util/ContainUtilTest.java    |   30 +-
 .../struts2/ConventionPluginResourceLoader.java |   29 +
 .../apache/struts2/StrutsJUnit4TestCase.java    |    7 +-
 .../org/apache/struts2/StrutsRestTestCase.java  |  131 +++
 .../rest/DefaultContentTypeHandlerManager.java  |   15 +-
 515 files changed, 4066 insertions(+), 2918 deletions(-)
----------------------------------------------------------------------