date:20120801

svn commit: r1367870 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/dispatcher/mapper/ plugins/rest/src/main/java/org/apache/struts2/rest/ plugins/rest/src/test/java/org/apache/stru

2012-08-01 Thread lukaszlenart

Author: lukaszlenart
Date: Wed Aug  1 07:11:09 2012
New Revision: 1367870

URL: http://svn.apache.org/viewvc?rev=1367870&view=rev
Log:
WW-3857 changes RestActionMapper to return null if it cannot determine action 
mapping, adds comment to API

Modified:

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

struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java

struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java?rev=1367870&r1=1367869&r2=1367870&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java
 Wed Aug  1 07:11:09 2012
@@ -21,10 +21,10 @@
 
 package org.apache.struts2.dispatcher.mapper;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.opensymphony.xwork2.config.ConfigurationManager;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 
  *
@@ -51,7 +51,7 @@ public interface ActionMapper {
  *
  * @param request The servlet request
  * @param configManager The current configuration manager
- * @return The appropriate action mapping
+ * @return The appropriate action mapping or null if mapping cannot be 
determined
  */
 ActionMapping getMapping(HttpServletRequest request, ConfigurationManager 
configManager);
 

Modified: 
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java?rev=1367870&r1=1367869&r2=1367870&view=diff
==
--- 
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
 (original)
+++ 
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
 Wed Aug  1 07:11:09 2012
@@ -289,9 +289,10 @@ public class RestActionMapper extends De
 }
 
 mapping.setName(fullName);
+return mapping;
 }
-
-return mapping;
+// if action name isn't specified, it can be a normal request, to 
static resource, return null to allow handle that case
+return null;
 }
 
 private void handleDynamicMethodInvocation(ActionMapping mapping, String 
name) {

Modified: 
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java?rev=1367870&r1=1367869&r2=1367870&view=diff
==
--- 
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
 (original)
+++ 
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
 Wed Aug  1 07:11:09 2012
@@ -57,6 +57,15 @@ public class RestActionMapperTest extend
 };
 }
 
+public void testRootMapping() throws Exception {
+req.setRequestURI("/myapp/");
+req.setServletPath("/");
+
+ActionMapping mapping = mapper.getMapping(req, configManager);
+
+assertNull(mapping);
+}
+
 public void testGetMapping() throws Exception {
 req.setRequestURI("/myapp/animals/dog");
 req.setServletPath("/animals/dog");

[CONF] Confluence Changes in the last 24 hours

2012-08-01 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache BookKeeper (https://cwiki.apache.org/confluence/display/BOOKKEEPER)

Pages
-
Fsck and autorecovery edited by  uma maheswara rao g  (02:55 PM)
https://cwiki.apache.org/confluence/display/BOOKKEEPER/Fsck+and+autorecovery



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
JMS edited by  bvahdat  (01:30 PM)
https://cwiki.apache.org/confluence/display/CAMEL/JMS



Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC)

Pages
-
JAXRS Kerberos created by sergey_beryozkin (08:01 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAXRS+Kerberos

WS-SecurityPolicy edited by  cohei...@apache.org  (10:17 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/WS-SecurityPolicy

Client HTTP Transport (including SSL support) edited by  sergey_beryozkin  
(08:35 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/Client+HTTP+Transport+%28including+SSL+support%29

Security edited by  sergey_beryozkin  (07:54 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/Security

JAX-RS Deployment edited by  sergey_beryozkin  (06:00 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+Deployment



Apache Jena (https://cwiki.apache.org/confluence/display/JENA)

Pages
-
ProcessRelease edited by  andyseaborne  (03:05 AM)
https://cwiki.apache.org/confluence/display/JENA/ProcessRelease



Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA)

Pages
-
Kafka mirroring edited by  jjko...@gmail.com  (01:56 PM)
https://cwiki.apache.org/confluence/display/KAFKA/Kafka+mirroring

Performance testing edited by  nehanarkhede  (01:41 PM)
https://cwiki.apache.org/confluence/display/KAFKA/Performance+testing


Comments
https://cwiki.apache.org/confluence/display/KAFKA/Performance+testing (1)

Apache OpenOffice Community 
(https://cwiki.apache.org/confluence/display/OOOUSERS)

Pages
-
OpenOffice Conference 2012 edited by  dpharbison  (01:40 PM)
https://cwiki.apache.org/confluence/display/OOOUSERS/OpenOffice+Conference+2012

AOO 3.4.1 Release Notes edited by  p...@apache.org  (12:22 PM)
https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4.1+Release+Notes



Apache Openmeetings (https://cwiki.apache.org/confluence/display/OPENMEETINGS)

Pages
-
Tutoriales en español relacionados con OpenMeetings edited by  greenes  (11:18 
AM)
https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27837303

Tutorials related to OpenMeetings edited by  greenes  (10:40 AM)
https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+related+to+OpenMeetings



Apache S4 (https://cwiki.apache.org/confluence/display/S4)

Pages
-
Fault tolerance in S4 created by mmorel (12:23 PM)
https://cwiki.apache.org/confluence/display/S4/Fault+tolerance+in+S4



Apache Sqoop (https://cwiki.apache.org/confluence/display/SQOOP)

Pages
-
Meeting Minutes - August 1, 2012 created by k...@cloudera.com (05:47 PM)
https://cwiki.apache.org/confluence/display/SQOOP/Meeting+Minutes+-+August+1%2C+2012

Sqoop2 Quickstart edited by  jarcec  (04:04 PM)
https://cwiki.apache.org/confluence/display/SQOOP/Sqoop2+Quickstart

How to Update Project Website edited by  k...@cloudera.com  (03:09 PM)
https://cwiki.apache.org/confluence/display/SQOOP/How+to+Update+Project+Website



Apache Syncope (https://cwiki.apache.org/confluence/display/SYNCOPE)

Pages
-
Roadmap edited by  ilgrosso  (07:11 AM)
https://cwiki.apache.org/confluence/display/SYNCOPE/Roadmap




Change your notification preferences: 
https://cwiki.apache.org/confluence/users/viewnotifications.action

svn commit: r1367870 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/dispatcher/mapper/ plugins/rest/src/main/java/org/apache/struts2/rest/ plugins/rest/src/test/java/org/apache/stru

[CONF] Confluence Changes in the last 24 hours

2 matches

Site Navigation

Mail list logo

Footer information