You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/05/24 20:30:26 UTC
svn commit: r1342367 - in
/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm:
RMInInterceptor.java RMManager.java RMOutInterceptor.java
soap/RMSoapInterceptor.java
Author: dkulp
Date: Thu May 24 18:30:26 2012
New Revision: 1342367
URL: http://svn.apache.org/viewvc?rev=1342367&view=rev
Log:
Merged revisions 1342040 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1342040 | dkulp | 2012-05-23 16:37:45 -0400 (Wed, 23 May 2012) | 3 lines
Better way to make sure no warnings logged when the RM stuff doesn't
really need or expect to have addressing maps
........
Modified:
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=1342367&r1=1342366&r2=1342367&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Thu May 24 18:30:26 2012
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
+import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.MAPAggregator;
import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -65,7 +65,7 @@ public class RMInInterceptor extends Abs
// message addressing properties may be null, e.g. in case of a runtime fault
// on the server side
- final AddressingPropertiesImpl maps = RMContextUtils.retrieveMAPs(message, false, false);
+ final AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
if (null == maps) {
return;
}
Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java?rev=1342367&r1=1342366&r2=1342367&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Thu May 24 18:30:26 2012
@@ -356,7 +356,7 @@ public class RMManager {
public String getAddressingNamespace(Message message) {
String addrUri = (String)message.getContextualProperty(WSRM_WSA_VERSION_PROPERTY);
if (addrUri == null) {
- AddressingPropertiesImpl maps = RMContextUtils.retrieveMAPs(message, false, false);
+ AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
if (maps != null) {
addrUri = maps.getNamespaceURI();
}
Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=1342367&r1=1342366&r2=1342367&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Thu May 24 18:30:26 2012
@@ -39,6 +39,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.ContextUtils;
@@ -67,7 +68,7 @@ public class RMOutInterceptor extends Ab
return;
}
- AddressingPropertiesImpl maps = RMContextUtils.retrieveMAPs(msg, false, true);
+ AddressingPropertiesImpl maps = (AddressingPropertiesImpl)ContextUtils.retrieveMAPs(msg, false, true, false);
if (null == maps) {
LogUtils.log(LOG, Level.WARNING, "MAPS_RETRIEVAL_FAILURE_MSG");
return;
@@ -291,7 +292,7 @@ public class RMOutInterceptor extends Ab
newex.setOutMessage(msg);
}
- private static void setAction(AddressingPropertiesImpl maps, String action) {
+ private static void setAction(AddressingProperties maps, String action) {
AttributedURIType actionURI = new AttributedURIType();
actionURI.setValue(action);
maps.setAction(actionURI);
Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1342367&r1=1342366&r2=1342367&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Thu May 24 18:30:26 2012
@@ -62,6 +62,7 @@ import org.apache.cxf.service.model.Bind
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.soap.MAPCodec;
import org.apache.cxf.ws.rm.AbstractRMInterceptor;
import org.apache.cxf.ws.rm.EncoderDecoder;
@@ -276,7 +277,7 @@ public class RMSoapInterceptor extends A
if (rmUri != null && rmUri.equals(ns)) {
if (codec == null) {
String wsauri = null;
- AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false);
+ AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
if (maps == null) {
wsauri = getManager(message).getAddressingNamespace(message);
} else {
@@ -343,7 +344,7 @@ public class RMSoapInterceptor extends A
*/
private void updateServiceModelInfo(SoapMessage message) throws Fault {
- AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false);
+ AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false);
AttributedURIType actionURI = null == maps ? null : maps.getAction();
String action = null == actionURI ? null : actionURI.getValue().trim();