svn commit: r1409910 - in /cxf/branches/2.6.x-fixes: api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

[dkulp]

Author: dkulp
Date: Thu Nov 15 18:35:17 2012
New Revision: 1409910

URL: http://svn.apache.org/viewvc?rev=1409910&view=rev
Log:
Merged revisions 1409324 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1409324 | dkulp | 2012-11-14 14:50:20 -0500 (Wed, 14 Nov 2012) | 3 lines

  [CXF-4629] Skip the URIMappingInterceptor if ws-security is being used.
  Part 1 of fix, backportable.

........

Modified:
    
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
    
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

Modified: 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=1409910&r1=1409909&r2=1409910&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
 Thu Nov 15 18:35:17 2012
@@ -45,6 +45,7 @@ import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageContentsList;
+import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.invoker.MethodDispatcher;
@@ -55,6 +56,7 @@ import org.apache.cxf.service.model.Oper
 import org.apache.cxf.service.model.ServiceModelUtil;
 
 public class URIMappingInterceptor extends AbstractInDatabindingInterceptor {
+    public static final String URIMAPPING_SKIP = 
URIMappingInterceptor.class.getName() + ".skip";
     
     private static final Logger LOG = 
LogUtils.getL7dLogger(URIMappingInterceptor.class);
     
@@ -73,6 +75,9 @@ public class URIMappingInterceptor exten
             }
             return;
         }
+        if (MessageUtils.getContextualBoolean(message, URIMAPPING_SKIP, 
false)) {
+            return;
+        }
 
         String opName = getOperationName(message);
         if (LOG.isLoggable(Level.FINE)) {

Modified: 
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1409910&r1=1409909&r2=1409910&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 Thu Nov 15 18:35:17 2012
@@ -59,6 +59,7 @@ import org.apache.cxf.common.security.Si
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.URIMappingInterceptor;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptor;
@@ -192,6 +193,8 @@ public class WSS4JInInterceptor extends 
         if (msg.containsKey(SECURITY_PROCESSED) || isGET(msg)) {
             return;
         }
+        //make sure we skip the URIMapping as we cannot apply security 
requirements to that
+        msg.put(URIMappingInterceptor.URIMAPPING_SKIP, Boolean.TRUE);
         msg.put(SECURITY_PROCESSED, Boolean.TRUE);
         
         boolean utWithCallbacks =