Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b180908e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b180908e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b180908e Branch: refs/heads/feature/move-jsps-under-webinf Commit: b180908eb953ff8bdca67d2de82c7c50bac16386 Parents: 9c5177c a799554 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Mar 6 21:42:26 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Mar 6 21:42:26 2014 +0100 ---------------------------------------------------------------------- apps/blank/pom.xml | 10 +- apps/jboss-blank/pom.xml | 10 +- apps/mailreader/pom.xml | 10 +- apps/pom.xml | 80 +- apps/portlet/pom.xml | 8 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 8 +- archetypes/pom.xml | 8 +- archetypes/struts2-archetype-angularjs/pom.xml | 10 +- archetypes/struts2-archetype-blank/pom.xml | 10 +- archetypes/struts2-archetype-convention/pom.xml | 10 +- archetypes/struts2-archetype-dbportlet/pom.xml | 10 +- archetypes/struts2-archetype-plugin/pom.xml | 10 +- archetypes/struts2-archetype-portlet/pom.xml | 10 +- archetypes/struts2-archetype-starter/pom.xml | 10 +- assembly/pom.xml | 8 +- bundles/admin/pom.xml | 8 +- bundles/demo/pom.xml | 8 +- bundles/pom.xml | 8 +- core/pom.xml | 8 +- core/src/main/resources/struts-default.xml | 8 +- core/src/site/resources/tags/a.html | 976 ++++----- core/src/site/resources/tags/action.html | 208 +- core/src/site/resources/tags/actionerror.html | 752 +++---- core/src/site/resources/tags/actionmessage.html | 752 +++---- core/src/site/resources/tags/ajax/a.html | 1104 +++++------ .../site/resources/tags/ajax/autocompleter.html | 1328 ++++++------- core/src/site/resources/tags/ajax/bind.html | 480 ++--- .../resources/tags/ajax/datetimepicker.html | 976 ++++----- core/src/site/resources/tags/ajax/div.html | 1200 +++++------ core/src/site/resources/tags/ajax/head.html | 192 +- core/src/site/resources/tags/ajax/submit.html | 1168 +++++------ .../site/resources/tags/ajax/tabbedpanel.html | 864 ++++---- core/src/site/resources/tags/ajax/textarea.html | 800 ++++---- core/src/site/resources/tags/ajax/tree.html | 1184 +++++------ core/src/site/resources/tags/ajax/treenode.html | 736 +++---- core/src/site/resources/tags/append.html | 112 +- core/src/site/resources/tags/bean.html | 128 +- core/src/site/resources/tags/checkbox.html | 752 +++---- core/src/site/resources/tags/checkboxlist.html | 2 +- core/src/site/resources/tags/combobox.html | 912 ++++----- core/src/site/resources/tags/component.html | 736 +++---- core/src/site/resources/tags/date.html | 176 +- core/src/site/resources/tags/debug.html | 736 +++---- core/src/site/resources/tags/div.html | 752 +++---- core/src/site/resources/tags/doubleselect.html | 1440 +++++++------- core/src/site/resources/tags/else.html | 80 +- core/src/site/resources/tags/elseif.html | 96 +- core/src/site/resources/tags/fielderror.html | 768 +++---- core/src/site/resources/tags/file.html | 768 +++---- core/src/site/resources/tags/form.html | 960 ++++----- core/src/site/resources/tags/generator.html | 176 +- core/src/site/resources/tags/head.html | 736 +++---- core/src/site/resources/tags/hidden.html | 736 +++---- core/src/site/resources/tags/if.html | 96 +- core/src/site/resources/tags/include.html | 96 +- .../resources/tags/inputtransferselect.html | 1072 +++++----- core/src/site/resources/tags/iterator.html | 192 +- core/src/site/resources/tags/label.html | 752 +++---- core/src/site/resources/tags/merge.html | 112 +- core/src/site/resources/tags/optgroup.html | 160 +- .../resources/tags/optiontransferselect.html | 1872 +++++++++--------- core/src/site/resources/tags/param.html | 128 +- core/src/site/resources/tags/password.html | 832 ++++---- core/src/site/resources/tags/property.html | 192 +- core/src/site/resources/tags/push.html | 96 +- core/src/site/resources/tags/radio.html | 832 ++++---- core/src/site/resources/tags/reset.html | 832 ++++---- core/src/site/resources/tags/select.html | 912 ++++----- core/src/site/resources/tags/set.html | 160 +- core/src/site/resources/tags/sort.html | 144 +- core/src/site/resources/tags/submit.html | 832 ++++---- core/src/site/resources/tags/subset.html | 176 +- core/src/site/resources/tags/text.html | 144 +- core/src/site/resources/tags/textarea.html | 800 ++++---- core/src/site/resources/tags/textfield.html | 816 ++++---- core/src/site/resources/tags/token.html | 736 +++---- core/src/site/resources/tags/updownselect.html | 1008 +++++----- core/src/site/resources/tags/url.html | 336 ++-- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 8 +- plugins/config-browser/pom.xml | 8 +- plugins/convention/pom.xml | 8 +- plugins/dojo/pom.xml | 8 +- plugins/dwr/pom.xml | 8 +- plugins/embeddedjsp/pom.xml | 8 +- plugins/gxp/pom.xml | 8 +- plugins/jasperreports/pom.xml | 8 +- plugins/javatemplates/pom.xml | 8 +- plugins/jfreechart/pom.xml | 8 +- plugins/jsf/pom.xml | 8 +- plugins/json/pom.xml | 8 +- plugins/junit/pom.xml | 8 +- plugins/osgi/pom.xml | 8 +- plugins/oval/pom.xml | 8 +- plugins/pell-multipart/pom.xml | 8 +- plugins/plexus/pom.xml | 8 +- plugins/pom.xml | 8 +- plugins/portlet-tiles/pom.xml | 8 +- plugins/portlet/pom.xml | 8 +- plugins/rest/pom.xml | 4 +- plugins/sitegraph/pom.xml | 8 +- plugins/sitemesh/pom.xml | 8 +- plugins/spring/pom.xml | 8 +- plugins/struts1/pom.xml | 8 +- plugins/testng/pom.xml | 8 +- plugins/tiles/pom.xml | 8 +- plugins/tiles3/pom.xml | 8 +- pom.xml | 13 +- src/site/resources/archetype-catalog.xml | 12 +- xwork-core/pom.xml | 8 +- 111 files changed, 18207 insertions(+), 18418 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b180908e/core/src/main/resources/struts-default.xml ----------------------------------------------------------------------
