[maven-release-plugin] copy for branch STRUTS_2_3_15_X

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_3_15_X@1528722 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 3, 2013 · 9a3d105 · 9a3d105
2 parents 2ede2ea + d82ebc3
commit 9a3d105
Show file tree

Hide file tree

Showing 60 changed files with 130 additions and 103 deletions.
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-blank</artifactId>

diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jboss-blank</artifactId>

diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.15.2-SNAPSHOT</version>
+      <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-mailreader</artifactId>

diff --git a/apps/pom.xml b/apps/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>

diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-portlet</artifactId>

diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>2.3.15.2-SNAPSHOT</version>
+    <version>2.3.15.3-SNAPSHOT</version>
     <name>Struts 2 Rest Showcase Example</name>
     <description>Struts 2 Rest Showcase Example</description>
 

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-archetypes</artifactId>

diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-blank</artifactId>
-    <version>2.3.15.2-SNAPSHOT</version>
+    <version>2.3.15.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Blank</name>
 

diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-convention</artifactId>
-    <version>2.3.15.2-SNAPSHOT</version>
+    <version>2.3.15.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Blank Convention</name>
 

diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-dbportlet</artifactId>
-    <version>2.3.15.2-SNAPSHOT</version>
+    <version>2.3.15.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Database Portlet</name>
 

diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-plugin</artifactId>
-    <version>2.3.15.2-SNAPSHOT</version>
+    <version>2.3.15.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Plugin</name>
 

diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-portlet</artifactId>
-    <version>2.3.15.2-SNAPSHOT</version>
+    <version>2.3.15.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Portlet</name>
 

diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-starter</artifactId>
-    <version>2.3.15.2-SNAPSHOT</version>
+    <version>2.3.15.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Starter</name>
 

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>
@@ -143,7 +143,7 @@
         <dependency>
             <groupId>org.apache.cxf.site-export</groupId>
             <artifactId>cxf-site-export</artifactId>
-            <version>1.0-20130702.031849-7</version>
+            <version>1.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 

diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>

diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.15.2-SNAPSHOT</version>
+        <version>2.3.15.3-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>

diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -1,4 +1,5 @@
 /*
+ * $Id$
  * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,6 +34,7 @@
 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 implements ActionMapper {
 
     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,25 +189,33 @@ public DefaultActionMapper() {
         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()));
                         }
                     }
                 });
 
                 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, bang);
+                                }
+                            }
+                            String actionName = cleanupActionName(name);
+                            mapping.setName(actionName);
+                            if (getDefaultExtension() != null) {
+                                actionName = actionName + "." + getDefaultExtension();
                             }
+                            mapping.setResult(new ServletDispatcherResult(actionName));
                         }
-                        mapping.setName(cleanupActionName(name));
                     }
                 });
 
@@ -225,7 +236,7 @@ protected void addParameterAction(String prefix, ParameterAction parameterAction
 
     @Inject(StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION)
     public void setAllowDynamicMethodCalls(String allow) {
-        allowDynamicMethodCalls = "true".equals(allow);
+        allowDynamicMethodCalls = "true".equalsIgnoreCase(allow);
     }
 
     @Inject(StrutsConstants.STRUTS_ENABLE_SLASHES_IN_ACTION_NAMES)
@@ -335,7 +346,7 @@ public void handleSpecialParameters(HttpServletRequest request, ActionMapping ma
             if (!uniqueParameters.contains(key)) {
                 ParameterAction parameterAction = (ParameterAction) prefixTrie.get(key);
                 if (parameterAction != null) {
-                    parameterAction.execute(key, mapping);
+                    parameterAction.execute(key, mapping, request);
                     uniqueParameters.add(key);
                     break;
                 }

diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
@@ -21,6 +21,8 @@
 
 package org.apache.struts2.dispatcher.mapper;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * Defines a parameter action prefix.  This is executed when the configured prefix key is matched in a parameter
  * name, allowing the implementation to manipulate the action mapping accordingly.  For example, if the "action:foo"
@@ -30,5 +32,5 @@
  * @since 2.1.0
  */
 public interface ParameterAction {
-    void execute(String key, ActionMapping mapping);
+    void execute(String key, ActionMapping mapping, HttpServletRequest request);
 }
diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties
@@ -105,7 +105,7 @@ struts.serve.static.browserCache=true
 ### like method:bar (but not action:foo).
 ### An alternative to implicit dynamic method invocation is to use wildcard
 ### mappings, such as <action name="*/*" method="{2}" class="actions.{1}">
-struts.enable.DynamicMethodInvocation = true
+struts.enable.DynamicMethodInvocation = false
 
 ### Set this to true if you wish to allow slashes in your action names.  If false,
 ### Actions names cannot have slashes, and will be accessible via any directory