struts git commit: Narrows possible locale to those from available locales
Repository: struts
Updated Branches:
refs/heads/support-2-3 609cb0bb9 -> 37842193a
Narrows possible locale to those from available locales
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/37842193
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/37842193
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/37842193
Branch: refs/heads/support-2-3
Commit: 37842193ab33b7655c78a2d2c305f2e0a0e50355
Parents: 609cb0b
Author: Lukasz Lenart
Authored: Fri Mar 11 11:03:36 2016 +0100
Committer: Lukasz Lenart
Committed: Fri Mar 11 11:03:36 2016 +0100
--
.../struts2/interceptor/I18nInterceptorTest.java| 16
.../xwork2/interceptor/I18nInterceptor.java | 5 +
.../xwork2/interceptor/I18nInterceptorTest.java | 16
3 files changed, 21 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/37842193/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
index 04d853e..07abec2 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
@@ -173,12 +173,12 @@ public class I18nInterceptorTest {
@Test
public void testCountryOnlyLocale() throws Exception {
-params.put(I18nInterceptor.DEFAULT_PARAMETER, "DK");
+params.put(I18nInterceptor.DEFAULT_PARAMETER, "NL");
interceptor.intercept(mai);
assertNull(params.get(I18nInterceptor.DEFAULT_PARAMETER)); // should
have been removed
-Locale denmark = new Locale("DK");
+Locale denmark = new Locale("NL");
assertNotNull(session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE));
// should be stored here
assertEquals(denmark,
session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); // should create a
locale object
}
@@ -197,31 +197,31 @@ public class I18nInterceptorTest {
@Test
public void testWithVariant() throws Exception {
-params.put(I18nInterceptor.DEFAULT_PARAMETER, "fr_CA_xx");
+params.put(I18nInterceptor.DEFAULT_PARAMETER, "ja_JP_JP");
interceptor.intercept(mai);
assertNull(params.get(I18nInterceptor.DEFAULT_PARAMETER)); // should
have been removed
-Locale variant = new Locale("fr", "CA", "xx");
+Locale variant = new Locale("ja", "JP", "JP");
Locale locale = (Locale)
session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE);
assertNotNull(locale); // should be stored here
assertEquals(variant, locale);
-assertEquals("xx", locale.getVariant());
+assertEquals("JP", locale.getVariant());
}
@Test
public void testWithVariantRequestOnly() throws Exception {
-params.put(I18nInterceptor.DEFAULT_REQUESTONLY_PARAMETER, "fr_CA_xx");
+params.put(I18nInterceptor.DEFAULT_REQUESTONLY_PARAMETER, "ja_JP_JP");
interceptor.intercept(mai);
assertNull(params.get(I18nInterceptor.DEFAULT_PARAMETER)); // should
have been removed
assertNull(session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE));
-Locale variant = new Locale("fr", "CA", "xx");
+Locale variant = new Locale("ja", "JP", "JP");
Locale locale = mai.getInvocationContext().getLocale();
assertNotNull(locale); // should be stored here
assertEquals(variant, locale);
-assertEquals("xx", locale.getVariant());
+assertEquals("JP", locale.getVariant());
}
@Test
http://git-wip-us.apache.org/repos/asf/struts/blob/37842193/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
index 3deb268..a0d4fc5 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
@@ -21,6 +21,7 @@ import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import java.util.Arrays;
import java.util.Locale;
import java.util.Map;
@@ -226,6 +227,10 @@ public class I18nInterceptor extends AbstractInterceptor {
LOG.debug("applied request locale=#0", locale);
struts git commit: Narrows possible locale to those from available locales
Repository: struts
Updated Branches:
refs/heads/master 3c68a3def -> fc2179cf1
Narrows possible locale to those from available locales
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fc2179cf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fc2179cf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fc2179cf
Branch: refs/heads/master
Commit: fc2179cf1ac9fbfb61e3430fa88b641d87253327
Parents: 3c68a3d
Author: Lukasz Lenart
Authored: Fri Mar 11 11:03:36 2016 +0100
Committer: Lukasz Lenart
Committed: Fri Mar 11 11:04:14 2016 +0100
--
.../xwork2/interceptor/I18nInterceptor.java | 5 +
.../xwork2/interceptor/I18nInterceptorTest.java | 16
.../struts2/interceptor/I18nInterceptorTest.java| 16
3 files changed, 21 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/fc2179cf/core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
index 186e42e..cf4995e 100644
---
a/core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
+++
b/core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
@@ -21,6 +21,7 @@ import com.opensymphony.xwork2.util.LocalizedTextUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.util.Arrays;
import java.util.Locale;
import java.util.Map;
@@ -218,6 +219,10 @@ public class I18nInterceptor extends AbstractInterceptor {
LOG.debug("Applied request locale: {}", locale);
}
}
+
+if (locale != null &&
!Arrays.asList(Locale.getAvailableLocales()).contains(locale)) {
+locale = Locale.getDefault();
+}
return locale;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/fc2179cf/core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
b/core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
index 5979e58..17c27aa 100644
---
a/core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
@@ -82,12 +82,12 @@ public class I18nInterceptorTest extends TestCase {
}
public void testCountryOnlyLocale() throws Exception {
-params.put(I18nInterceptor.DEFAULT_PARAMETER, "DK");
+params.put(I18nInterceptor.DEFAULT_PARAMETER, "NL");
interceptor.intercept(mai);
assertNull(params.get(I18nInterceptor.DEFAULT_PARAMETER)); // should
have been removed
-Locale denmark = new Locale("DK");
+Locale denmark = new Locale("NL");
assertNotNull(session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE));
// should be stored here
assertEquals(denmark,
session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); // should create a
locale object
}
@@ -104,30 +104,30 @@ public class I18nInterceptorTest extends TestCase {
}
public void testWithVariant() throws Exception {
-params.put(I18nInterceptor.DEFAULT_PARAMETER, "fr_CA_xx");
+params.put(I18nInterceptor.DEFAULT_PARAMETER, "ja_JP_JP");
interceptor.intercept(mai);
assertNull(params.get(I18nInterceptor.DEFAULT_PARAMETER)); // should
have been removed
-Locale variant = new Locale("fr", "CA", "xx");
+Locale variant = new Locale("ja", "JP", "JP");
Locale locale = (Locale)
session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE);
assertNotNull(locale); // should be stored here
assertEquals(variant, locale);
-assertEquals("xx", locale.getVariant());
+assertEquals("JP", locale.getVariant());
}
public void testWithVariantRequestOnly() throws Exception {
-params.put(I18nInterceptor.DEFAULT_REQUESTONLY_PARAMETER, "fr_CA_xx");
+params.put(I18nInterceptor.DEFAULT_REQUESTONLY_PARAMETER, "ja_JP_JP");
interceptor.intercept(mai);
assertNull(params.get(I18nInterceptor.DEFAULT_PARAMETER)); // should
have been removed
assertNull(session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE));
-Locale variant = new Locale("fr", "CA", "xx");
+Locale variant = new Locale("ja", "JP", "JP");
Locale locale = mai.getInvocationContext().getLocale();
assertNotNull(locale); //
svn commit: r982464 [4/4] - /websites/production/struts/content/docs/
Modified: websites/production/struts/content/docs/tiles-3-plugin.html == --- websites/production/struts/content/docs/tiles-3-plugin.html (original) +++ websites/production/struts/content/docs/tiles-3-plugin.html Fri Mar 11 11:02:24 2016 @@ -151,7 +151,7 @@ under the License.org.apache.tiles.extras.complete.CompleteAutoloadTilesListener -All package definitions which require tiles support must either extend the tiles-default package or must register the Tiles 3 Result type definition. +All package definitions which require tiles support must either extend the tiles-default package or must register the https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=Tiles+3+Result&linkCreation=true&fromPageId=30750969";>Tiles 3 Result type definition.Modified: websites/production/struts/content/docs/tiles-plugin.html == --- websites/production/struts/content/docs/tiles-plugin.html (original) +++ websites/production/struts/content/docs/tiles-plugin.html Fri Mar 11 11:02:24 2016 @@ -151,7 +151,7 @@ under the License. org.apache.struts2.tiles.StrutsTilesListener -All package definitions which require tiles support must either extend the tiles-default package or must register the Tiles Result type definition. +All package definitions which require tiles support must either extend the tiles-default package or must register the https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=Tiles+Result&linkCreation=true&fromPageId=27401";>Tiles Result type definition.Modified: websites/production/struts/content/docs/tiles-use.html == --- websites/production/struts/content/docs/tiles-use.html (original) +++ websites/production/struts/content/docs/tiles-use.html Fri Mar 11 11:02:24 2016 @@ -91,7 +91,7 @@ under the License. - Home > Guides > Plugin Developers Guide > Tiles Plugin > Tiles Use + Home > Guides > Plugin Developers Guide > Tiles 2 Plugin > Tiles Use https://www.google.com/search"; method="get"> Modified: websites/production/struts/content/docs/tutoriallesson06.html == --- websites/production/struts/content/docs/tutoriallesson06.html (original) +++ websites/production/struts/content/docs/tutoriallesson06.html Fri Mar 11 11:02:24 2016 @@ -144,7 +144,7 @@ under the License. Interceptors allow arbitrary code to be included in the call stack for your action before and/or after processing the action, which can vastly simplify your code itself and provide excellent opportunities for code reuse. Many of the features of XWork and WebWork are implemented as interceptors and can be applied via external configuration along with your own Interceptors in whatever order you specify for any set of actions you define. -In other words, when you access a *.action URL, WebWork's ServletDispatcher proceeds to the invocation of the an action object. Before it is executed, however, the invocation can be intercepted by another object, that is hence called interceptor. To have an interceptor executed before (or after) a given action, just configure xwork.xml properly, like the example below, taken from lesson 4.1.1: +In other words, when you access a *.action URL, WebWork's ServletDispatcher proceeds to the invocation of the an action object. Before it is executed, however, the invocation can be intercepted by another object, that is hence called interceptor. To have an interceptor executed before (or after) a given action, just configure xwork.xml properly, like the example below, taken from https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=TutorialLesson04-01-01&linkCreation=true&fromPageId=14155";>lesson 4.1.1: Interceptor configuration from lesson 4.1.1: @@ -157,7 +157,7 @@ under the License. -As you can see, lesson 4.1.1's formProcessing Action uses the validationWorkflowStack. That is an interceptor stack, which organizes a bunch of interceptors in the order in which they are to be executed. That stack is configured in webwork-default.xml, so all we have to do to use it is declare a under the action configuration or a , under package configuration, as seen in lesson 3's first example: +As you can see, lesson 4.1.1's formProcessing Action uses the va
svn commit: r982464 [3/4] - /websites/production/struts/content/docs/
Modified: websites/production/struts/content/docs/processing-forms.html
==
--- websites/production/struts/content/docs/processing-forms.html (original)
+++ websites/production/struts/content/docs/processing-forms.html Fri Mar 11
11:02:24 2016
@@ -138,7 +138,7 @@ under the License.
-This tutorial assumes you've
completed the Coding Struts 2
Actons tutorial and have a working coding_actions project. The example code
for this tutorial, form_processing, is available for checkout from the Struts 2
GitHub subversion repository: https://github.com/apache/struts-examples";
rel="nofollow">https://github.com/apache/struts-examples.IntroductionIn this tutorial we'll
explore using Struts 2 to do more involved processing of a form submission.
We'll cover how to use a Java model class to store the form input and how to
create the Struts 2 form to match up
with that model class.The code provided in this tutorial may be added
to the Coding Struts 2
Actions example or you can download this complete example from Google Code
- http://code.google.com/p/struts2-examples/downloads/list";
rel="nofollow">http://code.google.com/p/struts2-examples/downloads/list.The http://struts.apache.org/mail.html";>Struts 2 user
mailing list is an excellent place to get help. If you are having a problem
getting the tutorial example applications to work search the Struts 2 mailing
list. If you don't find an answer to your problem, post a question on the
mailing list.Forms and A Java Model
ClassFor this tutorial let's say we need to provide a form that a user
may submit to register for a prize drawing. Our business rules state the user
must provide his/her first name, last name, email address, and age.To
encapsulate this data, we'll use a simple Java class that follows the basic
Java Bean specifications (public set/get methods for each instance field). If
you're following along add this class to package
org.apache.struts.register.model in the Coding Struts 2 Actions
example.Person.java
+This tutorial assumes you've
completed the https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=Coding+Struts+2+Actons&linkCreation=true&fromPageId=14811889";>Coding
Struts 2 Actons tutorial and have a working coding_actions project. The
example code for this tutorial, form_processing, is available for checkout from
the Struts 2 GitHub subversion repository: https://github.com/apache/struts-examples";
rel="nofollow">https://github.com/apache/struts-examples.IntroductionIn this tutorial we'll
explore using Struts 2 to do more involv
ed processing of a form submission. We'll cover how to use a Java model class
to store the form input and how to create the Struts 2 form to match up with
that model class.The code provided in this tutorial may be added to the
Coding Struts 2 Actions
example or you can download this complete example from Google Code - http://code.google.com/p/struts2-examples/downloads/list";
rel="nofollow">http://code.google.com/p/struts2-examples/downloads/list.The http://struts.apache.org/mail.html";>Struts 2 user
mailing list is an excellent place to get help. If you are having a problem
getting the tutorial example
applications to work search the Struts 2 mailing list. If you don't find an
answer to your problem, post a question on the mailing list.Forms and A Java Model
ClassFor this tutorial let's say we need to provide a form that a user
may submit to register for a prize drawing. Our business rules state the user
must provide his/her first name, last name, email address, and age.To
encapsulate this data, we'll use a simple Java class that follows the basic
Java Bean specifications (public set/get methods for each instance field). If
you're following along add this class to package
org.apache.struts.register.model in the Coding Struts 2 Actions
example.Person.java
public class Person
{
private String firstName;
Modified: websites/production/struts/content/docs/release-notes-202.html
==
--- websites/production/struts/content/docs/release-notes-202.html (original)
+++ websites/production/struts/content/docs/release-notes-202.html Fri Mar 11
11:02:24 2016
@@ -172,7 +172,7 @@ under the License.
New Features and Plugins
-Plugins are now documented in the Apache Struts 2 Plugin Registry.Annotations: @Result annotation now supports
parameters (WW-1575).Ajax
Tags: The Autocompleter AJAX tag wraps Dojo's ComboBox and supports remote,
static, and JSON content.https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33274";>Spring
Plugin: Integrate Spring with your application using a plugin (WW-1499).
Or, if you prefer, use the https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33365";>Plexus
Plugin instead.File Uploading Explore multiple file
upl
svn commit: r982464 [2/4] - /websites/production/struts/content/docs/
Modified: websites/production/struts/content/docs/guides.html == --- websites/production/struts/content/docs/guides.html (original) +++ websites/production/struts/content/docs/guides.html Fri Mar 11 11:02:24 2016 @@ -125,7 +125,7 @@ under the License. -Our in-depth guides focus on specific areas of the framework, such as Views, the Core framework, and Third-party Extensions.We started work on a new User Guide, that should simplify learning process. Please feel free to contribute!https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=13945";>Core Developers GuideStruts 2 processes requests using three core types: interceptors, actions, and re sults. Each may be configured via XML or annotations.Tutorials - Read me first!Developing Applications with Struts 2NutshellAJAXDependency InjectionProfilingDebuggingDevelopment ModeConfigurationConfiguration by ConventionAnnotationsConfiguration ElementsA ctions, Wildcard Mappings, Beans, ConstantsExceptions, Includes, InterceptorsNamespaces, Packages, ResultsUnknown Handlers, DispatcherConfiguration Filesweb.xmlstruts.xmlstruts.propertiesstruts-default.xmlvelocity.propertiesstruts-default.vmApplication ServersPerformance Tuninghttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png"; data-emoticon-name="light-on" alt="(lightbulb)">SecurityTesting Actionshttps://depressedprogrammer.wordpress.com/2007/06/18/unit-testing-struts-2-actions-sprin g-junit/" rel="nofollow">(arsenalist)http://fassisrosa.blogspot.com/2006/11/unit-testing-struts-20.html"; rel="nofollow">(rosa)InterceptorsWriting InterceptorsExcluding ParametersActionsModel DrivenAction ChainingActionEventListenerResultsResult TypesDispatcherListenerPreResultListenerValidation LocalizationFormatting Dates and NumbersType ConversionStatic ContentPortletsTutorialConfiguration/DocumentationLoggingFAQsStruts 2 Maven ArchetypesCookbookhttp://struts.apache.org/2.x/struts2-core/apidocs/index.html";>Javadoc APIshttps://cwiki.apache.org/confluence/ pages/viewpage.action?pageId=14324">Tag Developers GuideThe framework offers a flexible view layer that supports multiple view technologies, including JSP, FreeMaker, and Velocity.Struts TagsGeneric TagsUI TagsThemes and TemplatesTag ReferenceAjax TagsAjax and JavaScript RecipesOGNLTag SyntaxAlt SyntaxJSPspecific tagsFreeMarkerspecific tagsVelocityspecific tagshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=44163";>Plugin Developers GuideApache Struts 2 provides a simple plugin architecture so that developers can extend the framework just by adding a JAR to the application's classpath. Since plugins are contained in a JAR, they are easy to share wit h others. Several plugins are bundled with the framework, and others are available from third-party sources.PluginsExtending an Application with Custom PluginsBundled PluginsBean Validation Plugin (2.5+)CDI (JSR 299) Plugin (2.3.1+)Codebehind Plugin (< 2.5)Config Browser PluginConvention Plugin (2.1.3+)DWR PluginEmbedded JSP Plugin (2.1.7+)JasperReports PluginJava 8 Support Plugin (2.3.21+)Javatemplates Plugin (2.1.3+)JFreeChart PluginJSF Plugin (< 2.5)JSON Plugin (2.1.7+)JUnit PluginOVal Plugin (2.1.7+)OSGi Plugin (2.1.7+)Plexus PluginPortlet PluginPortlet Tiles Plugin (2.3.5+)REST Plugin (2.1.1+)SiteGraph PluginSiteMesh PluginSpring PluginStruts 1 Plugin (< 2.5)TestNG PluginTiles PluginTiles 3 Plugin (< 2.5)https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png"; data-emoticon-name="tick" alt="(tick)"> For a complete list of bundled and third-party plugins, visit the http://cwiki.apache.org/S2PLUGINS/home.html";>Plugin Registry..https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=45478";>Architects Guide +Our in-depth guides focus on specific areas of the framework, such as Views, the Core framework, and Third-party Extensions.We started work on a new User Guide, that should simplify learning process. Please feel free to contribute!https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=13945";>Core Developers GuideStruts 2 processes requests using three core types: interceptors, actions, and re sults. Each may be configured via XML or annotations.Tutorials - Read me first!Developing Applications with Struts 2NutshellAJAXDependency InjectionProfilingDebuggingDevelopment ModeConfigurationConfiguration by ConventionAnnotationsConfiguration ElementsA ctions, Wildcard Mappings, Beans, ConstantsExceptions, Includes, InterceptorsNamespaces, Packages, ResultsUnknown Handlers, DispatcherConfiguration Filesweb.xmlstruts.xmlstruts.propertiesstruts-default.xmlvelocity.propertiesstruts-default.vmApplication ServersPerformance Tuninghttps://cwiki.apache.org/confluenc
svn commit: r982464 [1/4] - /websites/production/struts/content/docs/
Author: lukaszlenart Date: Fri Mar 11 11:02:24 2016 New Revision: 982464 Log: Updates production Added: websites/production/struts/content/docs/s2-028.html websites/production/struts/content/docs/s2-029.html websites/production/struts/content/docs/s2-030.html websites/production/struts/content/docs/version-notes-2325.html Modified: websites/production/struts/content/docs/action-configuration.html websites/production/struts/content/docs/actionmapper.html websites/production/struts/content/docs/ajax-and-javascript-recipes.html websites/production/struts/content/docs/building-struts-2-fast-track-release.html websites/production/struts/content/docs/building-struts-2-normal-release.html websites/production/struts/content/docs/building-struts-annotations.html websites/production/struts/content/docs/building-struts-master.html websites/production/struts/content/docs/cdi-plugin.html websites/production/struts/content/docs/control-tags.html websites/production/struts/content/docs/convention-plugin.html websites/production/struts/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html websites/production/struts/content/docs/crud-demo-i.html websites/production/struts/content/docs/cssxhtml-form-template.html websites/production/struts/content/docs/faqs.html websites/production/struts/content/docs/file-upload.html websites/production/struts/content/docs/form-tags.html websites/production/struts/content/docs/freemarker.html websites/production/struts/content/docs/guides.html websites/production/struts/content/docs/how-do-we-configure-an-interceptor-to-be-used-with-every-action.html websites/production/struts/content/docs/how-to-build-the-portlet-war-for-a-specific-portal-server.html websites/production/struts/content/docs/interceptors.html websites/production/struts/content/docs/json-plugin.html websites/production/struts/content/docs/localization.html websites/production/struts/content/docs/message-store-interceptor.html websites/production/struts/content/docs/migration-guide.html websites/production/struts/content/docs/objectfactory.html websites/production/struts/content/docs/obtain-response.html websites/production/struts/content/docs/ognl-basics.html websites/production/struts/content/docs/one-time-steps.html websites/production/struts/content/docs/portlet-tiles-plugin.html websites/production/struts/content/docs/processing-forms.html websites/production/struts/content/docs/release-notes-202.html websites/production/struts/content/docs/release-plan-200.html websites/production/struts/content/docs/rest-plugin.html websites/production/struts/content/docs/result-configuration.html websites/production/struts/content/docs/result-types.html websites/production/struts/content/docs/s2-003.html websites/production/struts/content/docs/sample-announcements.html websites/production/struts/content/docs/security-bulletins.html websites/production/struts/content/docs/security.html websites/production/struts/content/docs/struts-2-blank-archetype.html websites/production/struts/content/docs/struts-2-maven-archetypes.html websites/production/struts/content/docs/struts-2-spring-2-jpa-ajax.html websites/production/struts/content/docs/struts-next.html websites/production/struts/content/docs/tiles-3-plugin.html websites/production/struts/content/docs/tiles-plugin.html websites/production/struts/content/docs/tiles-use.html websites/production/struts/content/docs/tutoriallesson06.html websites/production/struts/content/docs/type-conversion.html websites/production/struts/content/docs/user-guide.html websites/production/struts/content/docs/using-freemarker-templates.html websites/production/struts/content/docs/validation.html websites/production/struts/content/docs/what-are-some-of-the-frameworks-best-features.html websites/production/struts/content/docs/what-is-the-actioncontext.html Modified: websites/production/struts/content/docs/action-configuration.html == --- websites/production/struts/content/docs/action-configuration.html (original) +++ websites/production/struts/content/docs/action-configuration.html Fri Mar 11 11:02:24 2016 @@ -139,11 +139,11 @@ under the License. The action mappings are the basic "unit-of-work" in the framework. Essentially, the action maps an identifier to a handler class. When a request matches the action's name, the framework uses the mapping to determine how to process the request./*
struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_25
Repository: struts Updated Branches: refs/heads/support-2-3 37842193a -> 8ca0f2fc4 [maven-release-plugin] prepare release STRUTS_2_3_25 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8ca0f2fc Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8ca0f2fc Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8ca0f2fc Branch: refs/heads/support-2-3 Commit: 8ca0f2fc464f592fa95d8435d0924c3b9da981ef Parents: 3784219 Author: Lukasz Lenart Authored: Fri Mar 11 16:02:17 2016 +0100 Committer: Lukasz Lenart Committed: Fri Mar 11 16:02:17 2016 +0100 -- 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/8ca0f2fc/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 247c89b..4824f81 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.25-SNAPSHOT +2.3.25 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/8ca0f2fc/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 91311a9..a01d43d 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.25-SNAPSHOT +2.3.25 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/8ca0f2fc/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 16cad55..b85c529 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.x
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_25 [created] bf62e120b
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/support-2-3 8ca0f2fc4 -> a67ac4525 [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/a67ac452 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a67ac452 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a67ac452 Branch: refs/heads/support-2-3 Commit: a67ac45258da4478b1695f209117a08b4c624512 Parents: 8ca0f2f Author: Lukasz Lenart Authored: Fri Mar 11 16:02:55 2016 +0100 Committer: Lukasz Lenart Committed: Fri Mar 11 16:02:55 2016 +0100 -- 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/a67ac452/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 4824f81..bfc9cc0 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.25 +2.3.26-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a67ac452/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index a01d43d..94ea70c 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.25 +2.3.26-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a67ac452/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index b85c529..554df4a 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailrea
svn commit: r12725 - /dev/struts/2.3.25/
Author: lukaszlenart Date: Fri Mar 11 19:54:26 2016 New Revision: 12725 Log: Updates test release 2.3.25 Added: dev/struts/2.3.25/ dev/struts/2.3.25/struts-2.3.25-all.zip (with props) dev/struts/2.3.25/struts-2.3.25-all.zip.asc (with props) dev/struts/2.3.25/struts-2.3.25-all.zip.md5 dev/struts/2.3.25/struts-2.3.25-all.zip.sha1 dev/struts/2.3.25/struts-2.3.25-apps.zip (with props) dev/struts/2.3.25/struts-2.3.25-apps.zip.asc (with props) dev/struts/2.3.25/struts-2.3.25-apps.zip.md5 dev/struts/2.3.25/struts-2.3.25-apps.zip.sha1 dev/struts/2.3.25/struts-2.3.25-docs.zip (with props) dev/struts/2.3.25/struts-2.3.25-docs.zip.asc (with props) dev/struts/2.3.25/struts-2.3.25-docs.zip.md5 dev/struts/2.3.25/struts-2.3.25-docs.zip.sha1 dev/struts/2.3.25/struts-2.3.25-lib.zip (with props) dev/struts/2.3.25/struts-2.3.25-lib.zip.asc (with props) dev/struts/2.3.25/struts-2.3.25-lib.zip.md5 dev/struts/2.3.25/struts-2.3.25-lib.zip.sha1 dev/struts/2.3.25/struts-2.3.25-min-lib.zip (with props) dev/struts/2.3.25/struts-2.3.25-min-lib.zip.asc (with props) dev/struts/2.3.25/struts-2.3.25-min-lib.zip.md5 dev/struts/2.3.25/struts-2.3.25-min-lib.zip.sha1 dev/struts/2.3.25/struts-2.3.25-src.zip (with props) dev/struts/2.3.25/struts-2.3.25-src.zip.asc (with props) dev/struts/2.3.25/struts-2.3.25-src.zip.md5 dev/struts/2.3.25/struts-2.3.25-src.zip.sha1 Added: dev/struts/2.3.25/struts-2.3.25-all.zip == Binary file - no diff available. Propchange: dev/struts/2.3.25/struts-2.3.25-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.25/struts-2.3.25-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.25/struts-2.3.25-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.25/struts-2.3.25-all.zip.md5 == --- dev/struts/2.3.25/struts-2.3.25-all.zip.md5 (added) +++ dev/struts/2.3.25/struts-2.3.25-all.zip.md5 Fri Mar 11 19:54:26 2016 @@ -0,0 +1 @@ +093e1908d1751fc3ac2f8fae4892c5a5 \ No newline at end of file Added: dev/struts/2.3.25/struts-2.3.25-all.zip.sha1 == --- dev/struts/2.3.25/struts-2.3.25-all.zip.sha1 (added) +++ dev/struts/2.3.25/struts-2.3.25-all.zip.sha1 Fri Mar 11 19:54:26 2016 @@ -0,0 +1 @@ +50eea5ad361d4616050ad9af5131fedc813dd27a \ No newline at end of file Added: dev/struts/2.3.25/struts-2.3.25-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.3.25/struts-2.3.25-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.25/struts-2.3.25-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.25/struts-2.3.25-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.25/struts-2.3.25-apps.zip.md5 == --- dev/struts/2.3.25/struts-2.3.25-apps.zip.md5 (added) +++ dev/struts/2.3.25/struts-2.3.25-apps.zip.md5 Fri Mar 11 19:54:26 2016 @@ -0,0 +1 @@ +912aaafc450574d2d9f03d51446bea8b \ No newline at end of file Added: dev/struts/2.3.25/struts-2.3.25-apps.zip.sha1 == --- dev/struts/2.3.25/struts-2.3.25-apps.zip.sha1 (added) +++ dev/struts/2.3.25/struts-2.3.25-apps.zip.sha1 Fri Mar 11 19:54:26 2016 @@ -0,0 +1 @@ +0de919a10655f982c8820608d54fe8c8959ce257 \ No newline at end of file Added: dev/struts/2.3.25/struts-2.3.25-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.3.25/struts-2.3.25-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.25/struts-2.3.25-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.25/struts-2.3.25-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.25/struts-2.3.25-docs.zip.md5 =
