svn commit: r1523936 - /struts/site/trunk/content/xdoc/index.xml
Author: lukaszlenart Date: Tue Sep 17 07:12:17 2013 New Revision: 1523936 URL: http://svn.apache.org/r1523936 Log: Adds missing word Modified: struts/site/trunk/content/xdoc/index.xml Modified: struts/site/trunk/content/xdoc/index.xml URL: http://svn.apache.org/viewvc/struts/site/trunk/content/xdoc/index.xml?rev=1523936&r1=1523935&r2=1523936&view=diff == --- struts/site/trunk/content/xdoc/index.xml (original) +++ struts/site/trunk/content/xdoc/index.xml Tue Sep 17 07:12:17 2013 @@ -48,7 +48,7 @@ limitations under the License. Want to help? -We welcome your help! If you want to more about how to build +We welcome your help! If you want to learn more about how to build and patch the Struts 2 codebase, please read the Developer Docs
svn commit: r1523937 - /struts/site/trunk/content/site.xml
Author: lukaszlenart Date: Tue Sep 17 07:13:03 2013 New Revision: 1523937 URL: http://svn.apache.org/r1523937 Log: Renames links to documentation Modified: struts/site/trunk/content/site.xml Modified: struts/site/trunk/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/trunk/content/site.xml?rev=1523937&r1=1523936&r2=1523937&view=diff == --- struts/site/trunk/content/site.xml (original) +++ struts/site/trunk/content/site.xml Tue Sep 17 07:13:03 2013 @@ -86,10 +86,10 @@ href="kickstart.html" /> http://struts.apache.org/release/2.3.x/index.html"; /> http://struts.apache.org/release/1.3.x/index.html"; />
svn commit: r878766 - in /websites/staging/struts/trunk/content: ./ dev/
Author: buildbot Date: Tue Sep 17 07:13:53 2013 New Revision: 878766 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) websites/staging/struts/trunk/content/announce-2002.html websites/staging/struts/trunk/content/announce-2003.html websites/staging/struts/trunk/content/announce-2004.html websites/staging/struts/trunk/content/announce-2005.html websites/staging/struts/trunk/content/announce-2006.html websites/staging/struts/trunk/content/announce-2007.html websites/staging/struts/trunk/content/announce-2008.html websites/staging/struts/trunk/content/announce-2009.html websites/staging/struts/trunk/content/announce-2010.html websites/staging/struts/trunk/content/announce-2011.html websites/staging/struts/trunk/content/announce-2012.html websites/staging/struts/trunk/content/announce.html websites/staging/struts/trunk/content/birdseye.html websites/staging/struts/trunk/content/dev/builds.html websites/staging/struts/trunk/content/dev/bylaws.html websites/staging/struts/trunk/content/dev/dev-mail.html websites/staging/struts/trunk/content/dev/git-for-struts.html websites/staging/struts/trunk/content/dev/releases.html websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html websites/staging/struts/trunk/content/dev/volunteers.html websites/staging/struts/trunk/content/download.html websites/staging/struts/trunk/content/downloads.html websites/staging/struts/trunk/content/faqs.html websites/staging/struts/trunk/content/helping.html websites/staging/struts/trunk/content/index.html websites/staging/struts/trunk/content/javadoc.html websites/staging/struts/trunk/content/kickstart.html websites/staging/struts/trunk/content/mail.html websites/staging/struts/trunk/content/primer.html websites/staging/struts/trunk/content/release-checklist.html websites/staging/struts/trunk/content/roadmap.html websites/staging/struts/trunk/content/security.html websites/staging/struts/trunk/content/struts1eol-announcement.html websites/staging/struts/trunk/content/struts1eol-press.html websites/staging/struts/trunk/content/youatstruts.html Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Sep 17 07:13:53 2013 @@ -1 +1 @@ -1521820 +1523936 Modified: websites/staging/struts/trunk/content/announce-2002.html == --- websites/staging/struts/trunk/content/announce-2002.html (original) +++ websites/staging/struts/trunk/content/announce-2002.html Tue Sep 17 07:13:53 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2002 and prior @@ -164,7 +164,7 @@ - Last Published: 2013-09-11 + Last Published: 2013-09-17 Modified: websites/staging/struts/trunk/content/announce-2003.html == --- websites/staging/struts/trunk/content/announce-2003.html (original) +++ websites/staging/struts/trunk/content/announce-2003.html Tue Sep 17 07:13:53 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2003 @@ -164,7 +164,7 @@ - Last Published: 2013-09-11 + Last Published: 2013-09-17 Modified: websites/staging/struts/trunk/content/announce-2004.html == --- websites/staging/struts/trunk/content/announce-2004.html (original) +++ websites/staging/struts/trunk/content/announce-2004.html Tue Sep 17 07:13:53 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2004 @@ -164,7 +164,7 @@ - Last Published: 2013-09-11 + Last Published: 2013-09-17 Modified: websites/staging/struts/trunk/content/announce-2005.html == --- websites/staging/struts/trunk/content/announce-2005.html (original) +++ websites/staging/struts/trunk/content/announce-2005.html Tue Sep 17 07:13:53 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - +
svn commit: r878767 - in /websites/staging/struts/trunk/content: ./ dev/
Author: buildbot Date: Tue Sep 17 07:15:19 2013 New Revision: 878767 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) websites/staging/struts/trunk/content/announce-2002.html websites/staging/struts/trunk/content/announce-2003.html websites/staging/struts/trunk/content/announce-2004.html websites/staging/struts/trunk/content/announce-2005.html websites/staging/struts/trunk/content/announce-2006.html websites/staging/struts/trunk/content/announce-2007.html websites/staging/struts/trunk/content/announce-2008.html websites/staging/struts/trunk/content/announce-2009.html websites/staging/struts/trunk/content/announce-2010.html websites/staging/struts/trunk/content/announce-2011.html websites/staging/struts/trunk/content/announce-2012.html websites/staging/struts/trunk/content/announce.html websites/staging/struts/trunk/content/birdseye.html websites/staging/struts/trunk/content/dev/builds.html websites/staging/struts/trunk/content/dev/bylaws.html websites/staging/struts/trunk/content/dev/dev-mail.html websites/staging/struts/trunk/content/dev/git-for-struts.html websites/staging/struts/trunk/content/dev/releases.html websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html websites/staging/struts/trunk/content/dev/volunteers.html websites/staging/struts/trunk/content/download.html websites/staging/struts/trunk/content/downloads.html websites/staging/struts/trunk/content/faqs.html websites/staging/struts/trunk/content/helping.html websites/staging/struts/trunk/content/index.html websites/staging/struts/trunk/content/javadoc.html websites/staging/struts/trunk/content/kickstart.html websites/staging/struts/trunk/content/mail.html websites/staging/struts/trunk/content/primer.html websites/staging/struts/trunk/content/release-checklist.html websites/staging/struts/trunk/content/roadmap.html websites/staging/struts/trunk/content/security.html websites/staging/struts/trunk/content/struts1eol-announcement.html websites/staging/struts/trunk/content/struts1eol-press.html websites/staging/struts/trunk/content/youatstruts.html Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Sep 17 07:15:19 2013 @@ -1 +1 @@ -1523936 +1523937 Modified: websites/staging/struts/trunk/content/announce-2002.html == --- websites/staging/struts/trunk/content/announce-2002.html (original) +++ websites/staging/struts/trunk/content/announce-2002.html Tue Sep 17 07:15:19 2013 @@ -93,10 +93,10 @@ Kickstart FAQ -Struts 2.3.x +Struts 2 -Struts 1.3.x +Struts 1 Modified: websites/staging/struts/trunk/content/announce-2003.html == --- websites/staging/struts/trunk/content/announce-2003.html (original) +++ websites/staging/struts/trunk/content/announce-2003.html Tue Sep 17 07:15:19 2013 @@ -93,10 +93,10 @@ Kickstart FAQ -Struts 2.3.x +Struts 2 -Struts 1.3.x +Struts 1 Modified: websites/staging/struts/trunk/content/announce-2004.html == --- websites/staging/struts/trunk/content/announce-2004.html (original) +++ websites/staging/struts/trunk/content/announce-2004.html Tue Sep 17 07:15:19 2013 @@ -93,10 +93,10 @@ Kickstart FAQ -Struts 2.3.x +Struts 2 -Struts 1.3.x +Struts 1 Modified: websites/staging/struts/trunk/content/announce-2005.html == --- websites/staging/struts/trunk/content/announce-2005.html (original) +++ websites/staging/struts/trunk/content/announce-2005.html Tue Sep 17 07:15:19 2013 @@ -93,10 +93,10 @@ Kickstart FAQ -Struts 2.3.x +Struts 2 -Struts 1.3.x +Struts 1 Modified: websites/staging/struts/trunk/c
svn commit: r1524182 - in /struts/struts2/trunk/archetypes: struts2-archetype-angularjs/ struts2-archetype-blank/ struts2-archetype-convention/ struts2-archetype-dbportlet/ struts2-archetype-portlet/
Author: jogep Date: Tue Sep 17 19:15:01 2013 New Revision: 1524182 URL: http://svn.apache.org/r1524182 Log: WW-4197 Update Archetypes READMEs Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt struts/struts2/trunk/archetypes/struts2-archetype-portlet/README.txt struts/struts2/trunk/archetypes/struts2-archetype-starter/README.txt Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt?rev=1524182&r1=1524181&r2=1524182&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt Tue Sep 17 19:15:01 2013 @@ -23,6 +23,12 @@ mvn archetype:generate -B -DgroupId=com. -DarchetypeVersion= \ -DremoteRepositories=http://struts.apache.org + +For more details about the Struts2 archetypes, please take a look at our Wiki page. + +-> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes + + IMPORTANT: == - The generated template uses the 'example' package, regardless of what you Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt?rev=1524182&r1=1524181&r2=1524182&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt Tue Sep 17 19:15:01 2013 @@ -22,6 +22,13 @@ mvn archetype:generate -B -DgroupId=com. -DarchetypeArtifactId=struts2-archetype-blank \ -DarchetypeVersion= \ -DremoteRepositories=http://struts.apache.org + + +For more details about the Struts2 archetypes, please take a look at our Wiki page. + +-> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes + + IMPORTANT: == - The generated template uses the 'example' package, regardless of what you Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt?rev=1524182&r1=1524181&r2=1524182&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt Tue Sep 17 19:15:01 2013 @@ -23,6 +23,10 @@ USAGE -DarchetypeVersion= \ -DremoteRepositories=http://struts.apache.org +For more details about the Struts2 archetypes, please take a look at our Wiki page. + +-> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes + IMPORTANT: == - The generated template uses the 'example' package, regardless of what you Modified: struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt?rev=1524182&r1=1524181&r2=1524182&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt Tue Sep 17 19:15:01 2013 @@ -25,6 +25,11 @@ mvn archetype:generate -B -DgroupId=com. -DarchetypeVersion= \ -DremoteRepositories=http://struts.apache.org +For more details about the Struts2 archetypes, please take a look at our Wiki page. + +-> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes + + - to compile, execute mvn compile Modified: struts/struts2/trunk/archetypes/struts2-archetype-portlet/README.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/README.txt?rev=1524182&r1=1524181&r2=1524182&view=diff == --- struts/struts2/trunk/archetypes/struts2
svn commit: r878853 - in /websites/production/struts/content: ./ development/ release/
Author: grobmeier Date: Tue Sep 17 19:08:55 2013 New Revision: 878853 Log: deploy new site to production Added: websites/production/struts/content/ - copied from r878852, websites/staging/struts/trunk/content/ websites/production/struts/content/development/ - copied from r878852, websites/production/struts/content/development/ websites/production/struts/content/release/ - copied from r878852, websites/production/struts/content/release/
svn commit: r1524184 - /struts/site/trunk/content/site.xml
Author: jogep Date: Tue Sep 17 19:20:11 2013 New Revision: 1524184 URL: http://svn.apache.org/r1524184 Log: Add Link to Wiki in the Documentation menu section Modified: struts/site/trunk/content/site.xml Modified: struts/site/trunk/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/trunk/content/site.xml?rev=1524184&r1=1524183&r2=1524184&view=diff == --- struts/site/trunk/content/site.xml (original) +++ struts/site/trunk/content/site.xml Tue Sep 17 19:20:11 2013 @@ -86,6 +86,9 @@ href="kickstart.html" /> https://cwiki.apache.org/confluence/display/WW/Home"; /> +http://struts.apache.org/release/2.3.x/index.html"; />
svn commit: r878857 - in /websites/staging/struts/trunk/content: ./ dev/
Author: buildbot Date: Tue Sep 17 19:21:43 2013 New Revision: 878857 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) websites/staging/struts/trunk/content/announce-2002.html websites/staging/struts/trunk/content/announce-2003.html websites/staging/struts/trunk/content/announce-2004.html websites/staging/struts/trunk/content/announce-2005.html websites/staging/struts/trunk/content/announce-2006.html websites/staging/struts/trunk/content/announce-2007.html websites/staging/struts/trunk/content/announce-2008.html websites/staging/struts/trunk/content/announce-2009.html websites/staging/struts/trunk/content/announce-2010.html websites/staging/struts/trunk/content/announce-2011.html websites/staging/struts/trunk/content/announce-2012.html websites/staging/struts/trunk/content/announce.html websites/staging/struts/trunk/content/birdseye.html websites/staging/struts/trunk/content/dev/builds.html websites/staging/struts/trunk/content/dev/bylaws.html websites/staging/struts/trunk/content/dev/dev-mail.html websites/staging/struts/trunk/content/dev/git-for-struts.html websites/staging/struts/trunk/content/dev/releases.html websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html websites/staging/struts/trunk/content/dev/volunteers.html websites/staging/struts/trunk/content/download.html websites/staging/struts/trunk/content/downloads.html websites/staging/struts/trunk/content/faqs.html websites/staging/struts/trunk/content/helping.html websites/staging/struts/trunk/content/index.html websites/staging/struts/trunk/content/javadoc.html websites/staging/struts/trunk/content/kickstart.html websites/staging/struts/trunk/content/mail.html websites/staging/struts/trunk/content/primer.html websites/staging/struts/trunk/content/release-checklist.html websites/staging/struts/trunk/content/roadmap.html websites/staging/struts/trunk/content/security.html websites/staging/struts/trunk/content/struts1eol-announcement.html websites/staging/struts/trunk/content/struts1eol-press.html websites/staging/struts/trunk/content/youatstruts.html Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Sep 17 19:21:43 2013 @@ -1 +1 @@ -1523937 +1524184 Modified: websites/staging/struts/trunk/content/announce-2002.html == --- websites/staging/struts/trunk/content/announce-2002.html (original) +++ websites/staging/struts/trunk/content/announce-2002.html Tue Sep 17 19:21:43 2013 @@ -93,6 +93,9 @@ Kickstart FAQ +https://cwiki.apache.org/confluence/display/WW/Home"; title="Wiki">Wiki + + Struts 2 Modified: websites/staging/struts/trunk/content/announce-2003.html == --- websites/staging/struts/trunk/content/announce-2003.html (original) +++ websites/staging/struts/trunk/content/announce-2003.html Tue Sep 17 19:21:43 2013 @@ -93,6 +93,9 @@ Kickstart FAQ +https://cwiki.apache.org/confluence/display/WW/Home"; title="Wiki">Wiki + + Struts 2 Modified: websites/staging/struts/trunk/content/announce-2004.html == --- websites/staging/struts/trunk/content/announce-2004.html (original) +++ websites/staging/struts/trunk/content/announce-2004.html Tue Sep 17 19:21:43 2013 @@ -93,6 +93,9 @@ Kickstart FAQ +https://cwiki.apache.org/confluence/display/WW/Home"; title="Wiki">Wiki + + Struts 2 Modified: websites/staging/struts/trunk/content/announce-2005.html == --- websites/staging/struts/trunk/content/announce-2005.html (original) +++ websites/staging/struts/trunk/content/announce-2005.html Tue Sep 17 19:21:43 2013 @@ -93,6 +93,9 @@ Kickstart FAQ +https://cwiki.apache.org/confluence/display/WW/Home"; title="Wiki">Wiki + + Struts 2 Modified: websites/staging/struts/trunk/content/announce-2006.html == --- websites/staging/struts/trunk/content/a
svn commit: r1524186 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter: StrutsPrepareAndExecuteFilter.java StrutsPrepareFilter.java
Author: jogep
Date: Tue Sep 17 19:30:29 2013
New Revision: 1524186
URL: http://svn.apache.org/r1524186
Log:
WW-4199 Exclusion of URLs should be done before calling prepare.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java?rev=1524186&r1=1524185&r2=1524186&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
Tue Sep 17 19:30:29 2013
@@ -82,12 +82,12 @@ public class StrutsPrepareAndExecuteFilt
HttpServletResponse response = (HttpServletResponse) res;
try {
-prepare.setEncodingAndLocale(request, response);
-prepare.createActionContext(request, response);
-prepare.assignDispatcherToThread();
if (excludedPatterns != null && prepare.isUrlExcluded(request,
excludedPatterns)) {
chain.doFilter(request, response);
} else {
+prepare.setEncodingAndLocale(request, response);
+prepare.createActionContext(request, response);
+prepare.assignDispatcherToThread();
request = prepare.wrapRequest(request);
ActionMapping mapping = prepare.findActionMapping(request,
response, true);
if (mapping == null) {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java?rev=1524186&r1=1524185&r2=1524186&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
Tue Sep 17 19:30:29 2013
@@ -79,12 +79,12 @@ public class StrutsPrepareFilter impleme
HttpServletResponse response = (HttpServletResponse) res;
try {
-prepare.setEncodingAndLocale(request, response);
-prepare.createActionContext(request, response);
-prepare.assignDispatcherToThread();
if (excludedPatterns != null && prepare.isUrlExcluded(request,
excludedPatterns)) {
request.setAttribute(REQUEST_EXCLUDED_FROM_ACTION_MAPPING, new
Object());
} else {
+prepare.setEncodingAndLocale(request, response);
+prepare.createActionContext(request, response);
+prepare.assignDispatcherToThread();
request = prepare.wrapRequest(request);
prepare.findActionMapping(request, response);
}
svn commit: r878859 - in /websites/production/struts/content: ./ development/ release/
Author: jogep Date: Tue Sep 17 19:44:26 2013 New Revision: 878859 Log: Publish Struts Site including Link to Wiki Page. Added: websites/production/struts/content/ - copied from r878858, websites/staging/struts/trunk/content/ websites/production/struts/content/development/ - copied from r878858, websites/production/struts/content/development/ websites/production/struts/content/release/ - copied from r878858, websites/production/struts/content/release/
svn commit: r1524296 - in /struts/struts2/branches/STRUTS_2_3_15_1_X: core/src/main/java/org/apache/struts2/dispatcher/mapper/ core/src/main/resources/org/apache/struts2/ core/src/test/java/org/apache
Author: lukaszlenart
Date: Wed Sep 18 05:50:13 2013
New Revision: 1524296
URL: http://svn.apache.org/r1524296
Log:
Disables DMI
Modified:
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/main/resources/org/apache/struts2/default.properties
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
struts/struts2/branches/STRUTS_2_3_15_1_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
struts/struts2/branches/STRUTS_2_3_15_1_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
Modified:
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=1524296&r1=1524295&r2=1524296&view=diff
==
---
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/branches/STRUTS_2_3_15_1_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Wed Sep 18 05:50:13 2013
@@ -1,5 +1,6 @@
/*
* $Id$
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -33,6 +34,7 @@ import org.apache.commons.lang3.StringUt
import org.apache.struts2.RequestUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.dispatcher.ServletDispatcherResult;
import org.apache.struts2.util.PrefixTrie;
import javax.servlet.http.HttpServletRequest;
@@ -168,8 +170,9 @@ public class DefaultActionMapper impleme
protected static final String METHOD_PREFIX = "method:";
protected static final String ACTION_PREFIX = "action:";
+private static final String STRUTS2_ACTION_PREFIX_PARSED =
"_struts2_action_prefix_parsed";
-protected boolean allowDynamicMethodCalls = true;
+protected boolean allowDynamicMethodCalls = false;
protected boolean allowSlashesInActionNames = false;
protected boolean alwaysSelectFullNamespace = false;
protected PrefixTrie prefixTrie = null;
@@ -186,7 +189,7 @@ public class DefaultActionMapper impleme
prefixTrie = new PrefixTrie() {
{
put(METHOD_PREFIX, new ParameterAction() {
-public void execute(String key, ActionMapping mapping) {
+public void execute(String key, ActionMapping mapping,
HttpServletRequest request) {
if (allowDynamicMethodCalls) {
mapping.setMethod(key.substring(METHOD_PREFIX.length()));
}
@@ -194,17 +197,25 @@ public class DefaultActionMapper impleme
});
put(ACTION_PREFIX, new ParameterAction() {
-public void execute(String key, ActionMapping mapping) {
-String name = key.substring(ACTION_PREFIX.length());
-if (allowDynamicMethodCalls) {
-int bang = name.indexOf('!');
-if (bang != -1) {
-String method = name.substring(bang + 1);
-mapping.setMethod(method);
-name = name.substring(0, bang);
+public void execute(final String key, ActionMapping
mapping, HttpServletRequest request) {
+if (request != null &&
request.getAttribute(STRUTS2_ACTION_PREFIX_PARSED) == null) {
+request.setAttribute(STRUTS2_ACTION_PREFIX_PARSED,
true);
+String name =
key.substring(ACTION_PREFIX.length());
+if (allowDynamicMethodCalls) {
+int bang = name.indexOf('!');
+if (bang != -1) {
+String method = name.substring(bang + 1);
+mapping.setMethod(method);
+name = name.substring(0, b
svn commit: r1524306 - /struts/struts2/tags/STRUTS_2_3_15_2/
Author: lukaszlenart Date: Wed Sep 18 06:32:56 2013 New Revision: 1524306 URL: http://svn.apache.org/r1524306 Log: [maven-release-plugin] copy for tag STRUTS_2_3_15_2 Added: struts/struts2/tags/STRUTS_2_3_15_2/ (props changed) - copied from r1524305, struts/struts2/branches/STRUTS_2_3_15_1_X/ Propchange: struts/struts2/tags/STRUTS_2_3_15_2/ -- reviewboard:url = https://reviews.apache.org Propchange: struts/struts2/tags/STRUTS_2_3_15_2/ -- --- svn:ignore (added) +++ svn:ignore Wed Sep 18 06:32:56 2013 @@ -0,0 +1,10 @@ +.classpath +.project +.settings +*.ipr +*.iml +*.iws +target +.idea + +test-output Propchange: struts/struts2/tags/STRUTS_2_3_15_2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Sep 18 06:32:56 2013 @@ -0,0 +1,5 @@ +/struts/struts2/branches/STRUTS_2_2_1_1:1037870-1053416 +/struts/struts2/branches/STRUTS_2_3_14_2_X:1488895,1488897,1488899-1488900 +/struts/struts2/branches/STRUTS_2_3_14_X:1469249,1486054,1486076,1486164,1486576 +/struts/struts2/tags/STRUTS_2_2_1:965062-1037869 +/struts/struts2/trunk:1497786
