svn commit: r1533102 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

2013-10-17 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu Oct 17 15:06:24 2013
New Revision: 1533102

URL: http://svn.apache.org/r1533102
Log:
Removes JavaDoc about deprecated prefixes

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=1533102&r1=1533101&r2=1533102&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 Thu Oct 17 15:06:24 2013
@@ -1,6 +1,5 @@
 /*
  * $Id$
- * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -59,26 +58,17 @@ import java.util.regex.Pattern;
  * execution behaviour. The four prefixes are:
  * 
  * 
- * 
  * Method prefix - method:default
- * 
  * Action prefix - action:dashboard
- * 
- * Redirect prefix - redirect:cancel.jsp
- * 
- * Redirect-action prefix - redirectAction:cancel
- * 
  * 
  * 
- *  In addition to these four prefixes, this mapper also understands the
+ * In addition to these four prefixes, this mapper also understands the
  * action naming pattern of foo!bar in either the extension form (eg:
  * foo!bar.action) or in the prefix form (eg: action:foo!bar). This syntax 
tells
  * this mapper to map to the action named foo and the method bar.
  * 
  * 
- * 
- *  Method Prefix 
- * 
+ * Method Prefix
  * 
  * 
  * With method-prefix, instead of calling baz action's execute() method (by
@@ -99,9 +89,7 @@ import java.util.regex.Pattern;
  *  
  *  
  * 
- * 
- *  Action prefix 
- * 
+ * Action prefix
  * 
  * 
  * With action-prefix, instead of executing baz action's execute() method (by
@@ -120,49 +108,6 @@ import java.util.regex.Pattern;
  *  
  *  
  * 
- * 
- *  Redirect prefix 
- * 
- * 
- * 
- * With redirect-prefix, instead of executing baz action's execute() method (by
- * default it isn't overriden in struts.xml to be something else), it will get
- * redirected to, in this case to www.google.com. Internally it uses
- * ServletRedirectResult to do the task.
- * 
- * 
- * 
- * 
- *  
- *  
- *  
- *  
- *  
- *  
- *  
- * 
- * 
- *  Redirect-action prefix 
- * 
- * 
- * 
- * With redirect-action-prefix, instead of executing baz action's execute()
- * method (by default it isn't overriden in struts.xml to be something else), 
it
- * will get redirected to, in this case 'dashboard.action'. Internally it uses
- * ServletRedirectResult to do the task and read off the extension from the
- * struts.properties.
- * 
- * 
- * 
- * 
- *  
- *  
- *  
- *  
- *  
- *  
- *  
- * 
  */
 public class DefaultActionMapper implements ActionMapper {
 
@@ -383,8 +328,8 @@ public class DefaultActionMapper impleme
 namespace = "";
 boolean rootAvailable = false;
 // Find the longest matching namespace, defaulting to the default
-for (Object cfg : config.getPackageConfigs().values()) {
-String ns = ((PackageConfig) cfg).getNamespace();
+for (PackageConfig cfg : config.getPackageConfigs().values()) {
+String ns = cfg.getNamespace();
 if (ns != null && prefix.startsWith(ns) && (prefix.length() == 
ns.length() || prefix.charAt(ns.length()) == '/')) {
 if (ns.length() > namespace.length()) {
 namespace = ns;
@@ -429,7 +374,7 @@ public class DefaultActionMapper impleme
 rawActionName, allowedActionNames);
 }
 String cleanActionName = rawActionName;
-for(String chunk : allowedActionNames.split(rawActionName)) {
+for (String chunk : allowedActionNames.split(rawActionName)) {
 cleanActionName = cleanActionName.replace(chunk, "");
 }
 if (LOG.isDebugEnabled()) {

svn commit: r1533217 - in /struts/site/trunk/content: resources/archetype-catalog.xml xdoc/announce.xml xdoc/download.xml xdoc/downloads.xml xdoc/index.xml

2013-10-17 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu Oct 17 19:14:22 2013
New Revision: 1533217

URL: http://svn.apache.org/r1533217
Log:
Updates site to match the latest release

Modified:
struts/site/trunk/content/resources/archetype-catalog.xml
struts/site/trunk/content/xdoc/announce.xml
struts/site/trunk/content/xdoc/download.xml
struts/site/trunk/content/xdoc/downloads.xml
struts/site/trunk/content/xdoc/index.xml

Modified: struts/site/trunk/content/resources/archetype-catalog.xml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/archetype-catalog.xml?rev=1533217&r1=1533216&r2=1533217&view=diff
==
--- struts/site/trunk/content/resources/archetype-catalog.xml (original)
+++ struts/site/trunk/content/resources/archetype-catalog.xml Thu Oct 17 
19:14:22 2013
@@ -7,42 +7,42 @@
 
 org.apache.struts
 struts2-archetype-blank
-2.3.15.2
+2.3.15.3
 
https://repository.apache.org/content/groups/public/
 Struts 2 Archetypes - Blank
 
 
 org.apache.struts
 struts2-archetype-convention
-2.3.15.2
+2.3.15.3
 
https://repository.apache.org/content/groups/public/
 Struts 2 Archetypes - Blank Convention
 
 
 org.apache.struts
 struts2-archetype-dbportlet
-2.3.15.2
+2.3.15.3
 
https://repository.apache.org/content/groups/public/
 Struts 2 Archetypes - Database Portlet
 
 
 org.apache.struts
 struts2-archetype-plugin
-2.3.15.2
+2.3.15.3
 
https://repository.apache.org/content/groups/public/
 Struts 2 Archetypes - Plugin
 
 
 org.apache.struts
 struts2-archetype-portlet
-2.3.15.2
+2.3.15.3
 
https://repository.apache.org/content/groups/public/
 Struts 2 Archetypes - Portlet
 
 
 org.apache.struts
 struts2-archetype-starter
-2.3.15.2
+2.3.15.3
 
https://repository.apache.org/content/groups/public/
 Struts 2 Archetypes - Starter
 

Modified: struts/site/trunk/content/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/xdoc/announce.xml?rev=1533217&r1=1533216&r2=1533217&view=diff
==
--- struts/site/trunk/content/xdoc/announce.xml (original)
+++ struts/site/trunk/content/xdoc/announce.xml Thu Oct 17 19:14:22 2013
@@ -30,7 +30,50 @@ limitations under the License.
 Announcements - 2012
 
 
-20 September 2013 - Struts 2.3.15.2 General 
Availability Release - Security Fix Release
+15 October 2013 - Struts 2.3.15.3 General 
Availability Release - Security Fix Release
+
+The Apache Struts group is pleased to announce that Struts 
2.3.15.3 is
+available as a "General Availability" release. The GA 
designation is our
+highest quality grade.
+
+
+Apache Struts 2 is an elegant, extensible framework for 
creating
+enterprise-ready Java web applications. The framework is 
designed to
+streamline the full development cycle, from building, to 
deploying, to
+maintaining applications over time.
+
+
+One security issue was solved with this release:
+
+
+http://struts.apache.org/release/2.3.x/docs/s2-018.html";>S2-018
+- Broken Access Control Vulnerability in Apache Struts2
+
+
+and proper support for action: prefix restored.
+
+
+All developers are strongly advised to update existing Struts 
2 applications to Struts 2.3.15.3.
+
+
+Struts 2.3.15.3 is available in a full distribution or as 
separate library, source, example and documentation distributions, from the
+http://struts.apache.org/download.cgi#struts23153";>releases page.
+The release is also available through the central Maven 
repository under Group ID "org.apache.struts". The
+http://struts.apache.org/release/2.3.x/docs/version-notes-23153.html";>release
 notes
+are available online.
+
+
+The 2.3.x series of the Apache Struts framework has a minimum
+requirement of the following specification versions: Servlet 
API 2.4,
+JSP API 2.0, and Java 5.
+
+
+

svn commit: r1533220 - /struts/site/trunk/content/xdoc/announce.xml

2013-10-17 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu Oct 17 19:18:45 2013
New Revision: 1533220

URL: http://svn.apache.org/r1533220
Log:
Updates site to match the latest release

Modified:
struts/site/trunk/content/xdoc/announce.xml

Modified: struts/site/trunk/content/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/xdoc/announce.xml?rev=1533220&r1=1533219&r2=1533220&view=diff
==
--- struts/site/trunk/content/xdoc/announce.xml (original)
+++ struts/site/trunk/content/xdoc/announce.xml Thu Oct 17 19:18:45 2013
@@ -49,8 +49,10 @@ limitations under the License.
 http://struts.apache.org/release/2.3.x/docs/s2-018.html";>S2-018
 - Broken Access Control Vulnerability in Apache Struts2
 
+
+and proper support for action: prefix was restored.
+
 
-and proper support for action: prefix restored.
 
 
 All developers are strongly advised to update existing Struts 
2 applications to Struts 2.3.15.3.

svn commit: r883034 - in /websites/staging/struts/trunk/content: ./ announce.html

2013-10-17 Thread buildbot 
Author: buildbot
Date: Thu Oct 17 19:20:14 2013
New Revision: 883034

Log:
Staging update by buildbot for struts

Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/announce.html

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Oct 17 19:20:14 2013
@@ -1 +1 @@
-1533217
+1533220

Modified: websites/staging/struts/trunk/content/announce.html
==
--- websites/staging/struts/trunk/content/announce.html (original)
+++ websites/staging/struts/trunk/content/announce.html Thu Oct 17 19:20:14 2013
@@ -219,8 +219,10 @@ limitations under the License. -->

svn commit: r883037 - in /websites/production/struts/content: ./ development/ release/

2013-10-17 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu Oct 17 19:37:11 2013
New Revision: 883037

Log:
Push to production

Added:
websites/production/struts/content/
  - copied from r883036, websites/staging/struts/trunk/content/
websites/production/struts/content/development/
  - copied from r883036, websites/production/struts/content/development/
websites/production/struts/content/release/
  - copied from r883036, websites/production/struts/content/release/

svn commit: r883044 - in /websites/production/struts/content/release/2.3.x: ./ docs/ docs/struts2-core/apidocs/ docs/struts2-core/apidocs/org/apache/struts2/ docs/struts2-core/apidocs/org/apache/strut

2013-10-17 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu Oct 17 20:20:14 2013
New Revision: 883044

Log:
Updates Struts2 subsite after release process


[This commit notification would consist of 176 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

[CONF] Confluence Changes in the last 24 hours

2013-10-17 Thread Anonymous (Confluence) 







   Apache ACE


Pages

 Page:
 Analysis and design for batch jobs
created by Marcel Offermans[01:33 PM]



   Apache Ambari (Incubating)


Pages

 Page:
 Instructions for installing Ambari-1.4.1 bits
created by Siddharth Wagle[06:32 PM]



   Apache Camel


Pages

 Page:
 Component List
edited by Preben Asmussen[07:25 PM]
(view changes)

 Page:
 Splunk
edited by Preben Asmussen[07:11 PM]
(view changes)

 Page:
 Camel 2.13.0 Release
edited by Ben O'Day[04:57 PM]
(view changes)

 Page:
 HDFS
edited by Ben O'Day[04:55 PM]
(view changes)

 Page:
 Mock
edited by Claus Ibsen[01:29 PM]
(view changes)

 Page:
 Bindy
edited by Claus Ibsen[10:41 AM]
(view changes)



   Apache Cloudstack


Pages

 Page:
 devcloud-kvm
edited by Marcus Sorensen[10:25 PM]
(view changes)

 Page:
 Cisco UCS Integration functional spec
edited by Animesh[08:26 PM]
(view changes)

 Page:
 CloudStack Collaboration Conference EU
created by Harm Boertien[02:56 PM]

 Page:
 CCC Europe
edited by Abhinandan Prateek[02:44 PM]
(view changes)

 Page:
 Dynamic Compute Offering FS
edited by Bharat Kumar[11:27 AM]
(view changes)

 Page:
 How To Work With CloudStack Documentation
edited by Jessica Tomechak[06:10 AM]
(view changes)

 Page:
 Coding conventions
edited by Rajani Karuturi[05:33 AM]
(view changes)



   Apache Flex


Pages

 Page:
 Status of Project
edited by Justin Mclean[06:01 AM]
(view changes)

 Page:
 Release Guide for the SDK
edited by Justin Mclean[02:11 AM]
(view changes)




Comments

 Page:
 Adobe Flash Builder 'New Project' Bug
has a new comment
[ Anonymou

svn commit: r1533336 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ main/java/org/apache/struts2/dispa

2013-10-17 Thread lukaszlenart 
Author: lukaszlenart
Date: Fri Oct 18 06:47:31 2013
New Revision: 156

URL: http://svn.apache.org/r156
Log:
WW-4227 Adds first step to define internal security mechanism

Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/

struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/DefaultSecurityGate.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/ParameterNameSecurityGuard.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/ParameterValueSecurityGuard.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/SecurityGate.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/SecurityGuard.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/SecurityPass.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/security/StrutsSecurityException.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/security/

struts/struts2/trunk/core/src/test/java/org/apache/struts2/security/ParameterNameSecurityGuardTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/security/ParameterValueSecurityGuardTest.java
Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=156&r1=155&r2=156&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java 
Fri Oct 18 06:47:31 2013
@@ -268,4 +268,7 @@ public final class StrutsConstants {
 /** actions names' whitelist **/
 public static final String STRUTS_ALLOWED_ACTION_NAMES = 
"struts.allowed.action.names";
 
+/** Security firewall **/
+public static final String STRUTS_SECURITY_GATE = "struts.securityGate";
+
 }

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=156&r1=155&r2=156&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
 Fri Oct 18 06:47:31 2013
@@ -70,6 +70,7 @@ import org.apache.struts2.components.Url
 import org.apache.struts2.dispatcher.StaticContentLoader;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
+import org.apache.struts2.security.SecurityGate;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 import org.apache.struts2.views.util.UrlHelper;
 import org.apache.struts2.views.velocity.VelocityManager;
@@ -406,6 +407,8 @@ public class BeanSelectionProvider imple
 
 alias(TextParser.class, StrutsConstants.STRUTS_EXPRESSION_PARSER, 
builder, props);
 
+alias(SecurityGate.class, StrutsConstants.STRUTS_SECURITY_GATE, 
builder, props);
+
 if 
("true".equalsIgnoreCase(props.getProperty(StrutsConstants.STRUTS_DEVMODE))) {
 props.setProperty(StrutsConstants.STRUTS_I18N_RELOAD, "true");
 props.setProperty(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, 
"true");

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=156&r1=155&r2=156&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 Fri Oct 18 06:47:31 2013
@@ -65,6 +65,7 @@ import org.apache.struts2.config.StrutsX
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts2.security.SecurityGate;
 import org.apache.struts2.util.At