struts-examples git commit: Uses only JDK8 to build the examples
Repository: struts-examples Updated Branches: refs/heads/master 1cdf6f278 -> f92c934ac Uses only JDK8 to build the examples Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/f92c934a Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/f92c934a Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/f92c934a Branch: refs/heads/master Commit: f92c934ac5f92412da27804c1cf5e50a1ff14a8a Parents: 1cdf6f2 Author: Lukasz Lenart Authored: Fri Jul 7 08:59:43 2017 +0200 Committer: Lukasz Lenart Committed: Fri Jul 7 08:59:43 2017 +0200 -- .travis.yml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/f92c934a/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index b735fb7..ec24f4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: java sudo: false jdk: - - openjdk7 - oraclejdk8 install: true
struts git commit: Adds constant to control proxy member access
Repository: struts
Updated Branches:
refs/heads/support-2-3 ae5630197 -> 086b63735
Adds constant to control proxy member access
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/086b6373
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/086b6373
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/086b6373
Branch: refs/heads/support-2-3
Commit: 086b63735527d4bb0c1dd0d86a7c0374b825ff24
Parents: ae56301
Author: Yasser Zamani
Authored: Fri Jul 7 13:35:10 2017 +0430
Committer: Yasser Zamani
Committed: Fri Jul 7 13:35:10 2017 +0430
--
.../spring/src/main/resources/struts-plugin.xml | 1 +
.../com/opensymphony/xwork2/XWorkConstants.java | 1 +
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 11 +
.../xwork2/ognl/OgnlValueStack.java | 1 +
.../xwork2/ognl/SecurityMemberAccess.java | 7 ++-
.../ognl/SecurityMemberAccessProxyTest.java | 49
.../xwork2/spring/actionContext-xwork.xml | 1 +
7 files changed, 70 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/086b6373/plugins/spring/src/main/resources/struts-plugin.xml
--
diff --git a/plugins/spring/src/main/resources/struts-plugin.xml
b/plugins/spring/src/main/resources/struts-plugin.xml
index 2e9b1b1..8f46858 100644
--- a/plugins/spring/src/main/resources/struts-plugin.xml
+++ b/plugins/spring/src/main/resources/struts-plugin.xml
@@ -34,6 +34,7 @@
+
http://git-wip-us.apache.org/repos/asf/struts/blob/086b6373/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index bc532d0..b0c2748 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -28,4 +28,5 @@ public final class XWorkConstants {
public static final String OVERRIDE_EXCLUDED_PATTERNS =
"overrideExcludedPatterns";
public static final String OVERRIDE_ACCEPTED_PATTERNS =
"overrideAcceptedPatterns";
+public static final String XWORK_DISALLOW_PROXY_MEMBER_ACCESS =
"xwork.disallowProxyMemberAccess";
}
http://git-wip-us.apache.org/repos/asf/struts/blob/086b6373/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 42132ba..e1cc46e 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -72,6 +72,7 @@ public class OgnlUtil {
private Container container;
private boolean allowStaticMethodAccess;
+private boolean disallowProxyMemberAccess;
@Inject
public void setXWorkConverter(XWorkConverter conv) {
@@ -144,6 +145,15 @@ public class OgnlUtil {
this.allowStaticMethodAccess =
Boolean.parseBoolean(allowStaticMethodAccess);
}
+@Inject(value = XWorkConstants.XWORK_DISALLOW_PROXY_MEMBER_ACCESS,
required = false)
+public void setDisallowProxyMemberAccess(String disallowProxyMemberAccess)
{
+this.disallowProxyMemberAccess =
Boolean.parseBoolean(disallowProxyMemberAccess);
+}
+
+public boolean isDisallowProxyMemberAccess() {
+return disallowProxyMemberAccess;
+}
+
/**
* Sets the object's properties using the default type converter,
defaulting to not throw
* exceptions for problems setting the properties.
@@ -654,6 +664,7 @@ public class OgnlUtil {
memberAccess.setExcludedClasses(excludedClasses);
memberAccess.setExcludedPackageNamePatterns(excludedPackageNamePatterns);
memberAccess.setExcludedPackageNames(excludedPackageNames);
+memberAccess.setDisallowProxyMemberAccess(disallowProxyMemberAccess);
return Ognl.createDefaultContext(root, resolver, defaultConverter,
memberAccess);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/086b6373/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 3f44169..f6decf3 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_33
Repository: struts Updated Branches: refs/heads/support-2-3 086b63735 -> 631ce98d1 [maven-release-plugin] prepare release STRUTS_2_3_33 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/631ce98d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/631ce98d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/631ce98d Branch: refs/heads/support-2-3 Commit: 631ce98d171b1c7adb680b41a0303c61a81678fd Parents: 086b637 Author: Lukasz Lenart Authored: Fri Jul 7 14:47:12 2017 +0200 Committer: Lukasz Lenart Committed: Fri Jul 7 14:47:12 2017 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- 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| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/java8-support/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- 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 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 53 files changed, 57 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/631ce98d/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index b6c696b..e1cb846 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.33-SNAPSHOT +2.3.33 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/631ce98d/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index a04e1b5..36f6208 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.33-SNAPSHOT +2.3.33 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/631ce98d/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 57b8704..adcb064 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_33 [created] 34255e2a3
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/support-2-3 631ce98d1 -> 16eb7fa76 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/16eb7fa7 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/16eb7fa7 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/16eb7fa7 Branch: refs/heads/support-2-3 Commit: 16eb7fa768b0c54b76f6241e56a59a509a4c0a3f Parents: 631ce98 Author: Lukasz Lenart Authored: Fri Jul 7 14:47:26 2017 +0200 Committer: Lukasz Lenart Committed: Fri Jul 7 14:47:26 2017 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- 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| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/java8-support/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- 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 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 53 files changed, 57 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/16eb7fa7/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index e1cb846..9f0f0c9 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.33 +2.3.34-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/16eb7fa7/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 36f6208..13dbdf1 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.33 +2.3.34-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/16eb7fa7/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index adcb064..08e6441 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreade
svn commit: r1015103 - in /websites/production/struts/content: announce.html index.html
Author: lukaszlenart Date: Fri Jul 7 16:25:47 2017 New Revision: 1015103 Log: Updates production Modified: websites/production/struts/content/announce.html websites/production/struts/content/index.html Modified: websites/production/struts/content/announce.html == --- websites/production/struts/content/announce.html (original) +++ websites/production/struts/content/announce.html Fri Jul 7 16:25:47 2017 @@ -125,6 +125,7 @@ Announcements + 9 July 2017 - Possible RCE in the Struts Showcase app in the Struts 1 plugin example in the Struts 2.3.x series 23 march 2017 - Struts Extras secure Multipart plugins General Availability - versions 1.1 20 march 2017 - Struts Extras secure Multipart plugins General Availability 7 march 2017 - Struts 2.5.10.1 General Availability @@ -136,6 +137,21 @@ Skip to: Announcements - 2016 +9 July 2017 - Possible RCE in the Struts Showcase app in the Struts 1 plugin example in the Struts 2.3.x series + +A potential security vulnerability was reported in the Struts 1 plugin used in the Struts 2.3.x series. +It is possible to perform a Remote Code Execution attack if given construction exists in the vulnerable +application. Please read the security bulletin for more details and inspect your application. + + + S2-048 +Possible RCE in the Struts Showcase app in the Struts 1 plugin example in Struts 2.3.x series + + +NOTE: Please notice that this vulnerability does not affect applications using Struts 2.5.x series +or applications that do not use the Struts 1 plugin. Even if the plugin is available but certain code +construction is not present, your application is safe. + 23 march 2017 - Struts Extras secure Multipart plugins General Availability - versions 1.1 The Apache Struts group is pleased to announce that the Apache Struts 2 Secure Jakarta Multipart parser plugin 1.1 Modified: websites/production/struts/content/index.html == --- websites/production/struts/content/index.html (original) +++ websites/production/struts/content/index.html Fri Jul 7 16:25:47 2017 @@ -166,6 +166,12 @@ +Potential RCE vulnerability in the Showcase app + + A potential security vulnerability was reported in the Struts 1 plugin used in the Struts 2.3.x series. + Please read more in S2-048 or in the official + Announcement + Apache Struts Extras GA
svn commit: r1015104 [3/3] - /websites/production/struts/content/docs/
Modified: websites/production/struts/content/docs/tutorials.html == --- websites/production/struts/content/docs/tutorials.html (original) +++ websites/production/struts/content/docs/tutorials.html Fri Jul 7 16:46:14 2017 @@ -125,7 +125,7 @@ under the License. -The framework documentation is written for active web developers and assumes a working knowledge about how Java web applications are built. For more about the underlying nuts and bolts, see the http://struts.apache.org/primer.html";>Key Technologies Primer.Several tutorials are available to help you get started with the framework, from all-purpose "soup to nuts" tutorials to specialty tutorials on portlets and database access.PrimersBootstrap - few simple steps how to start with Struts 2Getting Started - Tutorial s For Struts 2 BeginnersStruts 2 + Spring 2 + JPA + AJAXhttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png"; data-emoticon-name="yellow-star" alt="(star)"> http://www.scribd.com/doc/25244173/Java-Struts-Hibernate-Tutorial"; rel="nofollow">Struts 2 / Hibernate Tutorialhttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png"; data-emoticon-name="yellow-star" alt="(star)"> http://www.brucephillips.name/blog/index.cfm/2010/12/28/Recommended-Way-To-Structure-A-Spring-3-JPA-2-and-Maven-Web-Application"; rel="nofollow">Struts 2, Spring 3, JPA 2, Maven Example< /ul>SpecialityExtending an Application with Custom PluginsCRUD Made Easyhttp://www.jgeppert.com/2015/05/creating-java-web-applications-with-angularjs-and-struts2/"; rel="nofollow">Creating java web applications with AngularJS and Struts2http://www.jgeppert.com/2011/05/4-easy-steps-to-create-a-java-based-web-application-with-struts2-and-jquery/"; rel="nofollow">4 Easy Steps to create a Java based Web Application with Struts2 and jQueryJasperReports TutorialPortlet TutorialDeveloping a Portlet using Eclips eStruts 2 JUnit Plugin TutorialExamplesSeveral example applications are bundled with the framework, as ready-to-deploy WARs.BlankAn "empty" application that you can use as the starting point for your own projects.MailReaderA simple application that demonstrates best practices.PortletAn application demonstrating portlet supportShowcaseA sampling of common (and not so common) use cases.Other ExamplesSimple examples and links to "powered by" sitesFor the complete source code to the applications, see the source code distribution.Errata?To suggest a change or a correction to any part of the documentation, log in and leave a comment on the appropriate page. We are always looking for http://struts.apache.org/2.x/docs/contributors-guide.html ">help with the documentation!Next: Guides +The framework documentation is written for active web developers and assumes a working knowledge about how Java web applications are built. For more about the underlying nuts and bolts, see the http://struts.apache.org/primer.html";>Key Technologies Primer.Several tutorials are available to help you get started with the framework, from all-purpose "soup to nuts" tutorials to specialty tutorials on portlets and database access.PrimersBootstrap - few simple steps how to start with Struts 2Struts 2 + Spring 2 + JPA + AJAXhttps://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/star_yellow.png"; data-emoticon-name="yellow-star" alt="(star)"> http://www.scribd.com/doc/25244173/Java-Struts-Hibernate-Tutorial"; rel="nofollow">Struts 2 / Hibernate Tutorialhttps://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/star_yellow.png"; data-emoticon-name="yellow-star" alt="(star)"> http://www.brucephillips.name/blog/index.cfm/2010/12/28/Recommended-Way-To-Structure-A-Spring-3-JPA-2-and-Maven-Web-Application"; rel="nofollow">Struts 2, Spring 3, JPA 2, Maven ExampleSpecialityExtending an Application with Custom PluginsCRUD Made Easyhttp://www.jgeppert.com/2015/05/creating-java-web-applications-with-angularjs-and-struts2/"; rel="nofollow">Creating java web applications with AngularJS and Struts2http://www.jgeppert.com/2011/05/4-easy-steps-to-create-a-java-based-web-application-with-struts2-and-jquery/"; rel="nofollow">4 Easy Steps to create a Java based Web Application with Struts2 and jQueryJasperReports TutorialPortlet TutorialDeveloping a Portlet using EclipseStruts 2 JUnit Plugin Tutorial ExamplesSeveral example applications are bundled with the framework, as ready-to-deploy WARs.BlankAn "empty" application that you can use as the starting point for your own projects.MailReaderA simple application that demonstrates best practices.PortletAn application demonstrating portlet support
svn commit: r1015104 [1/3] - /websites/production/struts/content/docs/
Author: lukaszlenart Date: Fri Jul 7 16:46:14 2017 New Revision: 1015104 Log: Updates production Added: websites/production/struts/content/docs/s2-048.html websites/production/struts/content/docs/version-notes-2333.html websites/production/struts/content/docs/version-notes-2512.html Modified: websites/production/struts/content/docs/actionmapper.html websites/production/struts/content/docs/can-we-use-jstl-with-the-framework.html websites/production/struts/content/docs/client-validation.html websites/production/struts/content/docs/core-developers-guide.html websites/production/struts/content/docs/file-upload.html websites/production/struts/content/docs/freemarker.html websites/production/struts/content/docs/getting-started.html websites/production/struts/content/docs/guides.html websites/production/struts/content/docs/interceptors.html websites/production/struts/content/docs/jasperreports-plugin.html websites/production/struts/content/docs/localization.html websites/production/struts/content/docs/plugins.html websites/production/struts/content/docs/security-bulletins.html websites/production/struts/content/docs/security.html websites/production/struts/content/docs/spring-plugin.html websites/production/struts/content/docs/struts-defaultxml.html websites/production/struts/content/docs/strutsproperties.html websites/production/struts/content/docs/strutsxml-examples.html websites/production/struts/content/docs/tiles-plugin.html websites/production/struts/content/docs/tutorials.html websites/production/struts/content/docs/type-conversion.html websites/production/struts/content/docs/validation.html websites/production/struts/content/docs/validations-annotation.html websites/production/struts/content/docs/xhtml-theme.html Modified: websites/production/struts/content/docs/actionmapper.html == --- websites/production/struts/content/docs/actionmapper.html (original) +++ websites/production/struts/content/docs/actionmapper.html Fri Jul 7 16:46:14 2017 @@ -140,11 +140,11 @@ under the License. /**/ +/*]]>*/ DescriptionDefaultActionMapper Method prefixAction prefixAllowed action name RegExAllowed method name RegEx Custom ActionMapperCompositeActionMapperPrefixBasedActionMapperActionMapper and ActionMapping objects @@ -232,7 +232,7 @@ The factory will use the same set of pat } } -https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png"; data-emoticon-name="light-on" alt="(lightbulb)"> See also: RestfulActionMapperNext: Action Proxy & ActionProxy Factory +https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/lightbulb_on.png"; data-emoticon-name="light-on" alt="(lightbulb)"> See also: RestfulActionMapperNext: Action Proxy & ActionProxy Factory Modified: websites/production/struts/content/docs/can-we-use-jstl-with-the-framework.html == --- websites/production/struts/content/docs/can-we-use-jstl-with-the-framework.html (original) +++ websites/production/struts/content/docs/can-we-use-jstl-with-the-framework.html Fri Jul 7 16:46:14 2017 @@ -141,7 +141,7 @@ under the License. About JSTLThe http://java.sun.com/products/jsp/jstl/"; rel="nofollow">JavaServer Pages Standard Tag Library (JSTL) encapsulates as simple tags the core functionality common to many Web applications. JSTL has support for common, structural tasks such as iteration and conditionals, tags for manipulating XML documents, internationalization tags, and SQL tags. -https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png"; data-emoticon-name="tick" alt="(tick)"> JSTL integration is built into the framework - there are no steps required to enable it. Simply refer to your JSTL expressions just as you would with a normal SAF JSP tag, such as the property tag. +https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png"; data-emoticon-name="tick" alt="(tick)"> JSTL integration is built into the framework - there are no steps required to enable it. Simply refer to your JSTL expressions just as you would with a normal SAF JSP tag, such as the property tag.
svn commit: r1015104 [2/3] - /websites/production/struts/content/docs/
Modified: websites/production/struts/content/docs/localization.html
==
--- websites/production/struts/content/docs/localization.html (original)
+++ websites/production/struts/content/docs/localization.html Fri Jul 7
16:46:14 2017
@@ -140,14 +140,14 @@ under the License.
/**/
+/*]]>*/
OverviewResource Bundle Search Order
Default action's classUsing getText from a
TagUsing the
text tagUsing
the I18n tagUsing the Key attribute of UI
Tags
-I18n
InterceptorGlobal
Resources (struts.custom.i18n.resources) in struts.propertiesFormatting Dates
and NumbersComparison with Struts
1Custom
TextProvider and TextProviderFactoryNext: Type Conversion
+I18n
InterceptorGlobal
Resources (struts.custom.i18n.resources) in struts.propertiesFormatting Dates
and NumbersComparison with Struts
1Using
only global bundlesCustom
TextProvider and TextProviderFactoryNext: Type Conversion
OverviewThe framework supports
internationalization (i18n) in the following places:the UI TagsMessages and Errors from
the http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAware.html";>ValidationAware
interface (implemented by http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ActionSupport.html";>ActionSupport
and http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAwareSupport.html";>ValidationAwareSupport)Within
action classes that extend http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ActionSupport.html";>ActionSupport through the getText() methodResource Bundle Search
OrderResource bundles are searched in the following
order:ActionClass.propertiesInterface.properties
(every interface and sub-interface)BaseClass.properties
(all the way to Object.properties)ModelDriven's model (if implements
ModelDriven), for the model object repeat from 1package.properties (of
the directory where class is located and every parent directory all the way to
the root directory)search up the i18n message key hierarchy
itselfglobal resource propertiesThis is how it is
implemented in a default implementation of
the LocalizedTextProvider interface. You can provide
your own implementation using TextProvider and
TextProviderFactory interfaces.Package
hierarchyTo clarify #5, while traversing
the package hierarchy, Struts 2 will look for a file
package.properties:
com/
acme/
@@ -188,7 +188,9 @@ div.rbtoc1492970016830 li {margin-left:
]]>
Internationalizing SiteMesh
decorators is possible, but there are quirks. See https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33343";>SiteMesh
Plugin for more.Using the Key attribute of UI
TagsThe key attribute of most UI tags can be used to retrieve a message
from a resource bundle:
