Version 2.3.21 pushed for test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f4b4ffbd Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f4b4ffbd Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f4b4ffbd Branch: refs/heads/master Commit: f4b4ffbda1a640037bc82a8cce99e92a202b5b04 Parents: 2886a30 22cbf40 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Dec 31 18:13:31 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Dec 31 18:13:31 2014 +0100 ---------------------------------------------------------------------- .gitignore | 3 + apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 125 +--- apps/portlet/pom.xml | 5 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 16 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml | 2 +- archetypes/struts2-archetype-starter/pom.xml | 2 +- assembly/pom.xml | 6 +- bom/pom.xml | 18 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 24 +- .../struts2/interceptor/CookieInterceptor.java | 37 +- .../views/jsp/ui/AbstractUITagBeanInfo.java | 13 +- core/src/main/resources/struts-default.xml | 2 +- .../main/resources/template/simple/datetext.ftl | 21 + .../main/resources/template/xhtml/datetext.ftl | 23 + core/src/site/site.xml | 24 +- .../interceptor/CookieInterceptorTest.java | 38 +- .../SecurityMemberAccessInServletsTest.java | 81 +++ .../apache/struts2/views/jsp/TextTagTest.java | 4 +- plugins/cdi/pom.xml | 2 +- .../apache/struts2/cdi/CdiObjectFactory.java | 7 +- plugins/cdi/src/site/site.xml | 57 ++ plugins/codebehind/pom.xml | 2 +- plugins/codebehind/src/site/site.xml | 57 ++ plugins/config-browser/pom.xml | 2 +- plugins/config-browser/src/site/site.xml | 57 ++ plugins/convention/pom.xml | 2 +- .../PackageBasedActionConfigBuilder.java | 80 ++- plugins/convention/src/site/site.xml | 57 ++ plugins/dojo/pom.xml | 2 +- plugins/dojo/src/site/site.xml | 57 ++ plugins/dwr/pom.xml | 2 +- plugins/dwr/src/site/site.xml | 57 ++ plugins/embeddedjsp/pom.xml | 2 +- plugins/embeddedjsp/src/site/site.xml | 57 ++ plugins/gxp/pom.xml | 2 +- plugins/gxp/src/site/site.xml | 57 ++ plugins/jasperreports/pom.xml | 2 +- plugins/jasperreports/src/site/site.xml | 57 ++ plugins/java8-support/README.adoc | 11 + plugins/java8-support/pom.xml | 60 ++ .../struts2/convention/Java8ClassFinder.java | 585 +++++++++++++++++ .../convention/Java8ClassFinderFactory.java | 48 ++ .../src/main/resources/LICENSE.txt | 174 ++++++ .../java8-support/src/main/resources/NOTICE.txt | 5 + .../src/main/resources/struts-plugin.xml | 33 + plugins/java8-support/src/site/site.xml | 57 ++ plugins/javatemplates/pom.xml | 2 +- plugins/javatemplates/src/site/site.xml | 57 ++ plugins/jfreechart/pom.xml | 2 +- plugins/jfreechart/src/site/site.xml | 57 ++ plugins/jsf/pom.xml | 2 +- plugins/jsf/src/site/site.xml | 57 ++ plugins/json/pom.xml | 2 +- .../apache/struts2/json/JSONInterceptor.java | 22 +- plugins/json/src/site/site.xml | 57 ++ .../org/apache/struts2/json/AnotherBean.java | 32 + .../struts2/json/JSONInterceptorTest.java | 52 ++ .../org/apache/struts2/json/TestAction5.java | 52 ++ .../org/apache/struts2/json/json-12.txt | 8 + plugins/junit/pom.xml | 2 +- plugins/junit/src/site/site.xml | 57 ++ plugins/osgi/pom.xml | 2 +- plugins/osgi/src/site/site.xml | 57 ++ plugins/oval/pom.xml | 2 +- plugins/oval/src/site/site.xml | 57 ++ plugins/pell-multipart/pom.xml | 2 +- plugins/pell-multipart/src/site/site.xml | 57 ++ plugins/plexus/pom.xml | 2 +- plugins/plexus/src/site/site.xml | 57 ++ plugins/pom.xml | 33 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet-tiles/src/site/site.xml | 57 ++ plugins/portlet/pom.xml | 2 +- plugins/portlet/src/site/site.xml | 57 ++ plugins/rest/pom.xml | 2 +- plugins/rest/src/site/site.xml | 57 ++ plugins/sitegraph/pom.xml | 2 +- plugins/sitegraph/src/site/site.xml | 57 ++ plugins/sitemesh/pom.xml | 2 +- .../struts2/sitemesh/StrutsSiteMeshFactory.java | 31 +- plugins/sitemesh/src/site/site.xml | 57 ++ plugins/spring/pom.xml | 2 +- plugins/spring/src/site/site.xml | 57 ++ plugins/src/site/site.xml | 58 ++ plugins/struts1/pom.xml | 2 +- plugins/struts1/src/site/site.xml | 57 ++ plugins/testng/pom.xml | 2 +- plugins/testng/src/site/site.xml | 57 ++ plugins/tiles/pom.xml | 2 +- plugins/tiles/src/site/site.xml | 57 ++ plugins/tiles3/pom.xml | 2 +- plugins/tiles3/src/site/site.xml | 57 ++ pom.xml | 75 ++- src/site/markdown/plugins.md | 37 -- src/site/resources/archetype-catalog.xml | 50 -- src/site/resources/css/site.css | 71 --- src/site/resources/images/download.gif | Bin 3782 -> 0 bytes src/site/resources/images/help.gif | Bin 4678 -> 0 bytes src/site/resources/images/plugins.gif | Bin 3265 -> 0 bytes src/site/resources/images/struts2-arch.png | Bin 19723 -> 0 bytes src/site/resources/images/struts2-merger.png | Bin 37645 -> 0 bytes src/site/resources/images/struts2-merger2.png | Bin 37958 -> 0 bytes src/site/resources/images/struts2.png | Bin 10133 -> 0 bytes src/site/site.xml | 87 +-- src/site/xdoc/index.xml.vm | 260 -------- src/site/xdoc/jxr.xml | 46 -- xwork-core/pom.xml | 6 +- .../xwork2/DefaultActionInvocation.java | 45 +- .../com/opensymphony/xwork2/UnknownHandler.java | 5 +- .../interceptor/ParametersInterceptor.java | 2 +- .../xwork2/ognl/OgnlValueStack.java | 8 +- .../xwork2/ognl/SecurityMemberAccess.java | 32 +- .../xwork2/util/LocalizedTextUtil.java | 19 +- .../xwork2/util/finder/ClassFinder.java | 624 ++----------------- .../xwork2/util/finder/ClassFinderFactory.java | 29 + .../xwork2/util/finder/DefaultClassFinder.java | 582 +++++++++++++++++ xwork-core/src/site/site.xml | 57 ++ .../xwork2/DefaultActionInvocationTest.java | 265 +++++++- .../com/opensymphony/xwork2/SimpleAction.java | 3 + .../xwork2/ognl/OgnlValueStackTest.java | 20 + .../xwork2/ognl/SecurityMemberAccessTest.java | 63 +- 134 files changed, 4408 insertions(+), 1450 deletions(-) ----------------------------------------------------------------------
