svn commit: r1502979 - in /struts/struts2/branches/STRUTS_2_3_15_X: apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/ core/src/main/java/org/apache/struts2/dispatcher/mapper/ core/src/test/java/

2013-07-14 Thread rgielen 
Author: rgielen
Date: Sun Jul 14 14:18:39 2013
New Revision: 1502979

URL: http://svn.apache.org/r1502979
Log:
WW-4140
- Lukasz' patch applied

Modified:

struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl

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

struts/struts2/branches/STRUTS_2_3_15_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

Modified: 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl?rev=1502979&r1=1502978&r2=1502979&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
 (original)
+++ 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
 Sun Jul 14 14:18:39 2013
@@ -37,17 +37,13 @@
 
<@s.textfield label="Enter Some Text" 
name="text" />
 
-   <@s.submit name="action:actionPrefix" 
value="%{'action prefix'}" cssClass="btn" />
+   <@s.submit action="actionPrefix" 
value="%{'action prefix'}" cssClass="btn" />
 
-   <@s.submit name="method:alternateMethod" 
value="%{'method prefix'}" cssClass="btn" />
-
-   <@s.submit 
name="redirect:http://www.google.com"; value="%{'redirect prefix'}" 
cssClass="btn" />
-
-   <@s.submit 
name="redirect-action:redirectActionPrefix" value="%{'redirect-action prefix'}" 
cssClass="btn" />
+   <@s.submit method="alternateMethod" 
value="%{'method prefix'}" cssClass="btn" />
 
<@s.submit value="Normal Submit" cssClass="btn" 
/>
 
-   <@s.submit name="action:redirectActionPrefixAction" 
value="%{'redirect-action without prefix'}" cssClass="btn" />
+   <@s.submit action="redirectActionPrefixAction" 
value="%{'redirectAction without prefix'}" cssClass="btn" />
 



Modified: 
struts/struts2/branches/STRUTS_2_3_15_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_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=1502979&r1=1502978&r2=1502979&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_3_15_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_3_15_X/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 Sun Jul 14 14:18:39 2013
@@ -33,11 +33,15 @@ 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.ServletRedirectResult;
 import org.apache.struts2.util.PrefixTrie;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 /**
@@ -164,8 +168,6 @@ public class DefaultActionMapper impleme
 
 protected static final String METHOD_PREFIX = "method:";
 protected static final String ACTION_PREFIX = "action:";
-protected static final String REDIRECT_PREFIX = "redirect:";
-protected static final String REDIRECT_ACTION_PREFIX = "redirectAction:";
 
 protected boolean allowDynamicMethodCalls = true;
 protected boolean allowSlashesInActionNames = false;
@@ -186,8 +188,7 @@ public class DefaultActionMapper impleme
 put(METHOD_PREFIX, new ParameterAction() {
 public void execute(String key, ActionMapping mapping) {
 if (allowDynamicMethodCalls) {
-mapping.setMethod(key.substring(
-METHOD_PREFIX.length()));
+
mapping.setMethod(key.substring(METHOD_PREFIX.length()));
 }
 }
 });
@@ -203,34 +204,10 @@ public class DefaultActionMapper impleme
 name = name.substring(0, bang);
 }
 }
-mapping.setName(name);
+mapping.setName(cle

svn commit: r1502984 - /struts/struts2/branches/STRUTS_2_3_15_X/src/site/resources/archetype-catalog.xml

2013-07-14 Thread rgielen 
Author: rgielen
Date: Sun Jul 14 15:24:40 2013
New Revision: 1502984

URL: http://svn.apache.org/r1502984
Log:
Archetype versions changed for upcoming 2.3.15.1 release

Modified:

struts/struts2/branches/STRUTS_2_3_15_X/src/site/resources/archetype-catalog.xml

Modified: 
struts/struts2/branches/STRUTS_2_3_15_X/src/site/resources/archetype-catalog.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_X/src/site/resources/archetype-catalog.xml?rev=1502984&r1=1502983&r2=1502984&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_3_15_X/src/site/resources/archetype-catalog.xml
 (original)
+++ 
struts/struts2/branches/STRUTS_2_3_15_X/src/site/resources/archetype-catalog.xml
 Sun Jul 14 15:24:40 2013
@@ -7,42 +7,42 @@
 
 org.apache.struts
 struts2-archetype-blank
-2.3.15
+2.3.15.1
 http://repo1.maven.org/maven2/
 Struts 2 Archetypes - Blank
 
 
 org.apache.struts
 struts2-archetype-convention
-2.3.15
+2.3.15.1
 http://repo1.maven.org/maven2/
 Struts 2 Archetypes - Blank Convention
 
 
 org.apache.struts
 struts2-archetype-dbportlet
-2.3.15
+2.3.15.1
 http://repo1.maven.org/maven2/
 Struts 2 Archetypes - Database Portlet
 
 
 org.apache.struts
 struts2-archetype-plugin
-2.3.15
+2.3.15.1
 http://repo1.maven.org/maven2/
 Struts 2 Archetypes - Plugin
 
 
 org.apache.struts
 struts2-archetype-portlet
-2.3.15
+2.3.15.1
 http://repo1.maven.org/maven2/
 Struts 2 Archetypes - Portlet
 
 
 org.apache.struts
 struts2-archetype-starter
-2.3.15
+2.3.15.1
 http://repo1.maven.org/maven2/
 Struts 2 Archetypes - Starter

svn commit: r1502986 - /struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml

2013-07-14 Thread rgielen 
Author: rgielen
Date: Sun Jul 14 15:38:18 2013
New Revision: 1502986

URL: http://svn.apache.org/r1502986
Log:
tagging site export snapshot version for release

Modified:
struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml

Modified: struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml?rev=1502986&r1=1502985&r2=1502986&view=diff
==
--- struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml Sun Jul 14 
15:38:18 2013
@@ -144,7 +144,7 @@
 
 org.apache.cxf.site-export
 cxf-site-export
-1.0-SNAPSHOT
+1.0-20130702.031849-7
 runtime

svn commit: r1502997 - /struts/struts2/tags/STRUTS_2_3_15_1/

2013-07-14 Thread rgielen 
Author: rgielen
Date: Sun Jul 14 16:57:32 2013
New Revision: 1502997

URL: http://svn.apache.org/r1502997
Log:
[maven-release-plugin]  copy for tag STRUTS_2_3_15_1

Added:
struts/struts2/tags/STRUTS_2_3_15_1/   (props changed)
  - copied from r1502996, struts/struts2/branches/STRUTS_2_3_15_X/

Propchange: struts/struts2/tags/STRUTS_2_3_15_1/
--
reviewboard:url = https://reviews.apache.org

Propchange: struts/struts2/tags/STRUTS_2_3_15_1/
--
--- svn:ignore (added)
+++ svn:ignore Sun Jul 14 16:57:32 2013
@@ -0,0 +1,10 @@
+.classpath
+.project
+.settings
+*.ipr
+*.iml
+*.iws
+target
+.idea
+
+test-output

Propchange: struts/struts2/tags/STRUTS_2_3_15_1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jul 14 16:57:32 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

[CONF] Confluence Changes in the last 24 hours

2013-07-14 Thread Anonymous (Confluence) 







   Apache Axis


Pages

 Page:
 Report July 2013
edited by Andreas Veithen[07:53 PM]
(view changes)

 Page:
 PMC
edited by Andreas Veithen[07:48 PM]
(view changes)



   Apache Curator


Pages

 Page:
 Third Party Articles
edited by Jordan Zimmerman[05:36 PM]
(view changes)

 Page:
 Powered By
edited by Jordan Zimmerman[05:31 PM]
(view changes)



   Apache Falcon


Pages

 Page:
 How To Contribute
edited by Srikanth Sundarrajan[06:56 AM]
(view changes)



   Apache Kafka


Pages

 Page:
 Clients
edited by Paul Lam[03:34 PM]
(view changes)



   Apache OpenOffice Community


Pages

 Page:
 Localization Volunteers
edited by Sehzade Karababa[10:13 PM]
(view changes)

 Page:
 AOO 4.0 Release Notes
edited by Regina Henschel[08:15 PM]
(view changes)



   Apache Struts 2 Documentation


Pages

 Page:
 Migration Guide
edited by Rene Gielen[02:33 PM]
(view changes)

svn commit: r1503117 - /struts/struts2/trunk/src/site/xdoc/index.xml.vm

2013-07-14 Thread lukaszlenart 
Author: lukaszlenart
Date: Mon Jul 15 06:40:25 2013
New Revision: 1503117

URL: http://svn.apache.org/r1503117
Log:
Updates link to Plugin Registry

Modified:
struts/struts2/trunk/src/site/xdoc/index.xml.vm

Modified: struts/struts2/trunk/src/site/xdoc/index.xml.vm
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml.vm?rev=1503117&r1=1503116&r2=1503117&view=diff
==
--- struts/struts2/trunk/src/site/xdoc/index.xml.vm (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml.vm Mon Jul 15 06:40:25 2013
@@ -75,7 +75,7 @@
   
 
 
-http://cwiki.apache.org/S2PLUGINS/home.html"; 
style="margin:10px">
+https://cwiki.apache.org/confluence/display/S2PLUGINS/Home"; 
style="margin:10px">
   
 
   Plugin 
Registry