cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1227499 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/ rt/ws/addr/src/main/ja...
Date Thu, 05 Jan 2012 06:08:19 GMT
Author: ema
Date: Thu Jan  5 06:08:19 2012
New Revision: 1227499

URL: http://svn.apache.org/viewvc?rev=1227499&view=rev
Log:
Merged revisions 1227488,1227490,1227494 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1227488 | ema | 2012-01-05 13:31:31 +0800 (Thu, 05 Jan 2012) | 1 line
  
  [Minor fix]: correct to add rmDevivery in InFaultInterceptors
........
  r1227490 | ema | 2012-01-05 13:32:45 +0800 (Thu, 05 Jan 2012) | 1 line
  
  [CXF-3989]:messageConetxt.setScope(MessageContext.HTTP_REQUEST_HEADERS, Scope.APPLICATION)
leads to java.lang.IllegalArgumentException
........
  r1227494 | ema | 2012-01-05 13:39:40 +0800 (Thu, 05 Jan 2012) | 1 line
  
  [CXF-3981]:WS-Addressing related faults do not contain addressing headers
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
    cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  5 06:08:19 2012
@@ -1 +1 @@
-/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895,1226521,1227029
+/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895,1226521,1227029,1227488-1227494

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?rev=1227499&r1=1227498&r2=1227499&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
Thu Jan  5 06:08:19 2012
@@ -84,6 +84,11 @@ public abstract class AbstractFaultChain
                 if (null != mode) {
                     faultMessage.put(FaultMode.class, mode);
                 }
+                //CXF-3981
+                if (message.get("javax.xml.ws.addressing.context.inbound") != null) {
+                    faultMessage.put("javax.xml.ws.addressing.context.inbound",
+                                     message.get("javax.xml.ws.addressing.context.inbound"));
+                }
                 exchange.setOutMessage(null);
                 exchange.setOutFaultMessage(faultMessage);
                 if (message.get(BindingFaultInfo.class) != null) {

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=1227499&r1=1227498&r2=1227499&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
Thu Jan  5 06:08:19 2012
@@ -484,7 +484,7 @@ public class WrappedMessageContext imple
     }
 
     public final void setScope(String key, Scope arg1) {
-        if (!this.containsKey(key)) {
+        if (!this.containsKey(key) && !scopes.containsKey(key)) {
             throw new IllegalArgumentException("non-existant property-" + key + "is specified");
   
         }
         scopes.put(key, arg1);        

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java?rev=1227499&r1=1227498&r2=1227499&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
Thu Jan  5 06:08:19 2012
@@ -21,7 +21,13 @@ package org.apache.cxf.jaxws.context;
 
 
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.MessageContext.Scope;
 
 import org.apache.cxf.message.MessageImpl;
 import org.junit.After;
@@ -71,5 +77,19 @@ public class WebServiceContextImplTest e
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-    } 
+    }
+    
+    // CXF-3989
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testSetHttpRequestHeadersScope() {
+        MessageImpl msg = new MessageImpl();
+        MessageContext context = new WrappedMessageContext(msg);
+        Map headers = new HashMap<String, List<String>>();
+        List<String> values = new ArrayList<String>();
+        values.add("Value1");
+        headers.put("Header1", values);
+        context.put(MessageContext.HTTP_REQUEST_HEADERS, headers);
+        context.setScope(MessageContext.HTTP_REQUEST_HEADERS, Scope.APPLICATION);
+    }
 }

Modified: cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=1227499&r1=1227498&r2=1227499&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Thu Jan  5 06:08:19 2012
@@ -464,10 +464,12 @@ public class MAPAggregator extends Abstr
                         || (aicNonAnon2 != null && !aicNonAnon2.isEmpty());
                 
             if (hasAnonymous && hasNonAnon && !hasAnon) {
+                message.put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
                 throw new SoapFault("Found anonymous address but non-anonymous required",
                                     new QName(Names.WSA_NAMESPACE_NAME,
                                               "OnlyNonAnonymousAddressSupported"));
             } else if (!onlyAnonymous && !hasNonAnon && hasAnon) {
+                message.put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
                 throw new SoapFault("Found non-anonymous address but only anonymous supported",
                                     new QName(Names.WSA_NAMESPACE_NAME,
                                               "OnlyAnonymousAddressSupported"));

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java?rev=1227499&r1=1227498&r2=1227499&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java
Thu Jan  5 06:08:19 2012
@@ -59,7 +59,7 @@ public class RMPolicyInterceptorProvider
 
         getInFaultInterceptors().add(rmIn);
         getInFaultInterceptors().add(rmSoap);
-        getInInterceptors().add(rmDelivery);
+        getInFaultInterceptors().add(rmDelivery);
 
         getOutFaultInterceptors().add(rmOut);
         getOutFaultInterceptors().add(rmSoap);



Mime
View raw message