cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/4] git commit: Simplify the WS-Addressing properties used to store the properties on the message
Date Mon, 17 Mar 2014 14:58:30 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 03aeb4b7e -> 39f7b2602


Simplify the WS-Addressing properties used to store the properties on the message

Conflicts:
	core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
	core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
	rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
	rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e381ecf5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e381ecf5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e381ecf5

Branch: refs/heads/2.7.x-fixes
Commit: e381ecf5be337336fe53f0824b0ef68c1a638629
Parents: 03aeb4b
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Mar 11 13:00:46 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon Mar 17 10:55:56 2014 -0400

----------------------------------------------------------------------
 .../cxf/ws/addressing/JAXWSAConstants.java      | 21 +++++++++++------
 .../http_jetty/JettyHTTPDestinationTest.java    |  2 +-
 .../ws/addressing/impl/MAPAggregatorTest.java   | 24 ++++++++------------
 .../cxf/ws/addressing/soap/MAPCodecTest.java    | 10 +++-----
 .../org/apache/cxf/ws/mex/MEXInInterceptor.java |  2 +-
 .../apache/cxf/ws/rm/RMContextUtilsTest.java    |  2 +-
 .../apache/cxf/ws/rm/RMInInterceptorTest.java   | 12 +++++-----
 .../org/apache/cxf/ws/rm/RMManagerTest.java     |  2 +-
 .../apache/cxf/ws/rm/RMOutInterceptorTest.java  |  4 ++--
 .../java/org/apache/cxf/ws/rm/ServantTest.java  |  4 ++--
 .../policy/interceptors/STSInvoker.java         |  4 ++--
 .../SecureConversationInInterceptor.java        |  2 +-
 .../SpnegoContextTokenInInterceptor.java        |  2 +-
 .../cxf/sts/interceptor/SCTInInterceptor.java   |  2 +-
 .../cxf/sts/interceptor/SCTOutInterceptor.java  |  6 ++---
 .../cxf/systest/clustering/GreeterImplA.java    |  2 +-
 .../ws/addressing/AbstractGreeterImpl.java      |  4 ++--
 .../systest/ws/addressing/HeaderVerifier.java   |  8 +++----
 .../cxf/systest/ws/addressing/MAPVerifier.java  |  8 +++----
 19 files changed, 59 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/api/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java b/api/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
index 2a37e9a..0902fab 100644
--- a/api/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
+++ b/api/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
@@ -66,21 +66,28 @@ public final class JAXWSAConstants {
      * Well-known Property names for AddressingProperties in Handler
      * Context.
      */
-    public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = 
+    public static final String ADDRESSING_PROPERTIES_INBOUND = 
         "javax.xml.ws.addressing.context.inbound";
-    public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = 
-        "javax.xml.ws.addressing.context.outbound";
-    public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = 
-        "javax.xml.ws.addressing.context.inbound";
-    public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = 
+    public static final String ADDRESSING_PROPERTIES_OUTBOUND = 
         "javax.xml.ws.addressing.context.outbound";
+
+
+    @Deprecated
+    public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = ADDRESSING_PROPERTIES_INBOUND;
+    @Deprecated
+    public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = ADDRESSING_PROPERTIES_OUTBOUND;
+    @Deprecated
+    public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = ADDRESSING_PROPERTIES_INBOUND;
+    @Deprecated
+    public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = ADDRESSING_PROPERTIES_OUTBOUND;
+
     
     /**
      * Used by AddressingBuilder factory method.
      */
     public static final String DEFAULT_ADDRESSING_BUILDER =
         "org.apache.cxf.ws.addressing.impl.AddressingBuilderImpl";
-
+    
     /**
      * Prevents instantiation. 
      */

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 1ec0d34..91ed8a4 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -510,7 +510,7 @@ public class JettyHTTPDestinationTest extends Assert {
         maps.getToEndpointReference();
         EasyMock.expectLastCall().andReturn(refWithId);
         EasyMock.replay(maps);      
-        context.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, maps);
+        context.put(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND, maps);
         String result = destination.getId(context);
         assertNotNull(result);
         assertEquals("match our id", result, id);

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index dca0447..abec672 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -73,11 +73,9 @@ import org.junit.Test;
 
 import static org.apache.cxf.binding.soap.Soap11.SOAP_NAMESPACE;
 import static org.apache.cxf.message.Message.REQUESTOR_ROLE;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND;
 import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
 
 public class MAPAggregatorTest extends Assert {
 
@@ -405,7 +403,7 @@ public class MAPAggregatorTest extends Assert {
         maps.setMessageID(id);
         maps.setAction(ContextUtils.getAttributedURI(""));
         setUpMessageProperty(message,
-                             SERVER_ADDRESSING_PROPERTIES_OUTBOUND,
+                             ADDRESSING_PROPERTIES_OUTBOUND,
                              maps);
         setUpMessageProperty(message,
                              "org.apache.cxf.ws.addressing.map.fault.name",
@@ -436,7 +434,7 @@ public class MAPAggregatorTest extends Assert {
                              maps);
         aggregator.mediate(message, false);
         AddressingProperties props = 
-            (AddressingProperties)message.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+            (AddressingProperties)message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND);
         assertSame(replyTo, props.getReplyTo());
     }
 
@@ -690,7 +688,7 @@ public class MAPAggregatorTest extends Assert {
             maps.setAction(ContextUtils.getAttributedURI(""));
         }
         setUpMessageProperty(message,
-                             SERVER_ADDRESSING_PROPERTIES_INBOUND,
+                             ADDRESSING_PROPERTIES_INBOUND,
                              maps);
         if (!args.outbound) {
             setUpOneway(message, exchange, args.oneway);
@@ -720,7 +718,7 @@ public class MAPAggregatorTest extends Assert {
                                  REQUESTOR_ROLE,
                                  Boolean.FALSE);
             setUpMessageProperty(message,
-                                 SERVER_ADDRESSING_PROPERTIES_INBOUND,
+                                 ADDRESSING_PROPERTIES_INBOUND,
                                  maps);            
             if (args.fault) {
                 // REVISIT test double rebase does not occur
@@ -932,13 +930,9 @@ public class MAPAggregatorTest extends Assert {
     }
     
     private String getMAPProperty(boolean requestor, boolean outbound) { 
-        return requestor
-               ? outbound
-                 ? CLIENT_ADDRESSING_PROPERTIES_OUTBOUND
-                 : CLIENT_ADDRESSING_PROPERTIES_INBOUND
-               : outbound
-                 ? SERVER_ADDRESSING_PROPERTIES_OUTBOUND
-                 : SERVER_ADDRESSING_PROPERTIES_INBOUND;
+        return outbound
+                 ? ADDRESSING_PROPERTIES_OUTBOUND
+                 : ADDRESSING_PROPERTIES_INBOUND;
     }
 
     private void verifyMessage(Message message,

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index d40be62..9b77987 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -59,10 +59,8 @@ import org.junit.Test;
 
 import static org.apache.cxf.message.Message.MIME_HEADERS;
 import static org.apache.cxf.message.Message.REQUESTOR_ROLE;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND;
 
 public class MAPCodecTest extends Assert {
 
@@ -397,9 +395,7 @@ public class MAPCodecTest extends Assert {
     }
 
     private String getMAPProperty(boolean requestor, boolean outbound) {
-        return requestor ? outbound
-            ? CLIENT_ADDRESSING_PROPERTIES_OUTBOUND : CLIENT_ADDRESSING_PROPERTIES_INBOUND
: outbound
-            ? SERVER_ADDRESSING_PROPERTIES_OUTBOUND : SERVER_ADDRESSING_PROPERTIES_INBOUND;
+        return outbound ? ADDRESSING_PROPERTIES_OUTBOUND : ADDRESSING_PROPERTIES_INBOUND;
     }
 
     private AddressingPropertiesImpl getMAPs(boolean requestor, boolean outbound, String
uri) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java b/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java
index e032eaf..04d1cab 100644
--- a/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java
+++ b/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java
@@ -59,7 +59,7 @@ public class MEXInInterceptor extends AbstractPhaseInterceptor<Message>
{
         String action = (String)message.get(SoapBindingConstants.SOAP_ACTION);
         if (action == null) {
             AddressingProperties inProps = (AddressingProperties)message
-                .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+                .getContextualProperty(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND);
             if (inProps != null && inProps.getAction() != null) {
                 action = inProps.getAction().getValue();
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
index 5371cbe..9ae1f3c 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
@@ -143,7 +143,7 @@ public class RMContextUtilsTest extends Assert {
     public void testStoreMAPs() {
         Message msg = control.createMock(Message.class);
         AddressingProperties maps = control.createMock(AddressingProperties.class);
-        EasyMock.expect(msg.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, maps)).andReturn(null);
+        EasyMock.expect(msg.put(JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND, maps)).andReturn(null);
         control.replay();
         RMContextUtils.storeMAPs(maps, msg, true, true);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
index 8a8d671..e5c914d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
@@ -315,7 +315,7 @@ public class RMInInterceptorTest extends Assert {
         EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
         AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
         EasyMock.expect(maps.getNamespaceURI()).andReturn(Names200408.WSA_NAMESPACE_NAME).anyTimes();
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
         AttributedURIType actionURI = control.createMock(AttributedURIType.class);
         EasyMock.expect(maps.getAction()).andReturn(actionURI).times(2);
         EasyMock.expect(actionURI.getValue()).andReturn("foo");
@@ -379,7 +379,7 @@ public class RMInInterceptorTest extends Assert {
         interceptor.setManager(manager);
         
         // test 1. a normal sequence fault case without non-anonymous faultTo
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
         EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
         EasyMock.expect(message.get(RMMessageConstants.RM_PROTOCOL_VARIATION))
             .andReturn(ProtocolVariation.RM10WSA200408).anyTimes();
@@ -405,7 +405,7 @@ public class RMInInterceptorTest extends Assert {
         EasyMock.expect(exchange.get(Endpoint.class)).andReturn(ep).anyTimes();
         EasyMock.expect(maps.getFaultTo())
             .andReturn(RMUtils.createReference("http://localhost:9999/decoupled")).anyTimes();
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
         EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
         EasyMock.expect(message.get(RMMessageConstants.RM_PROTOCOL_VARIATION))
             .andReturn(ProtocolVariation.RM10WSA200408).anyTimes();
@@ -427,7 +427,7 @@ public class RMInInterceptorTest extends Assert {
         control.reset();
         EasyMock.expect(maps.getFaultTo())
             .andReturn(RMUtils.createAnonymousReference()).anyTimes();
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps).anyTimes();
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps).anyTimes();
         EasyMock.expect(manager.getDestination(message)).andReturn(d);
         EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
         EasyMock.expect(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY)).andReturn(true).anyTimes();
@@ -445,7 +445,7 @@ public class RMInInterceptorTest extends Assert {
         control.reset();
         EasyMock.expect(maps.getFaultTo())
             .andReturn(RMUtils.createAnonymousReference()).anyTimes();
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps).anyTimes();
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps).anyTimes();
         EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
         EasyMock.expect(message.get(RMMessageConstants.RM_PROTOCOL_VARIATION))
             .andReturn(ProtocolVariation.RM10WSA200408).anyTimes();
@@ -471,7 +471,7 @@ public class RMInInterceptorTest extends Assert {
         EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(!serverSide);
         AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
         EasyMock.expect(maps.getNamespaceURI()).andReturn(Names200408.WSA_NAMESPACE_NAME).anyTimes();
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
         
         AttributedURIType actionURI = control.createMock(AttributedURIType.class);
         EasyMock.expect(maps.getAction()).andReturn(actionURI).times(2);

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index 9583376..36c947c 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -234,7 +234,7 @@ public class RMManagerTest extends Assert {
         EasyMock.expect(exchange.getDestination()).andReturn(destination).anyTimes();
         AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
         EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(null);
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND))
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND))
             .andReturn(maps).anyTimes();
         EndpointReferenceType replyTo = RMUtils.createAnonymousReference();
         EasyMock.expect(maps.getReplyTo()).andReturn(replyTo).anyTimes();

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
index a4ca08a..244e1ad 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
@@ -96,7 +96,7 @@ public class RMOutInterceptorTest extends Assert {
         Message message = control.createMock(Message.class);        
         EasyMock.expect(interceptor.isRuntimeFault(message)).andReturn(false).anyTimes();
         EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.FALSE).anyTimes();
       
-        EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND))
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND))
             .andReturn(null).anyTimes();
         control.replay();
         interceptor.handle(message);
@@ -127,7 +127,7 @@ public class RMOutInterceptorTest extends Assert {
         EasyMock.expect(ex.getOutMessage()).andReturn(message).anyTimes();
         EasyMock.expect(ex.put("defer.uncorrelated.message.abort", Boolean.TRUE)).andReturn(null).anyTimes();
         EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.TRUE).anyTimes();
       
-        EasyMock.expect(message.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND))
+        EasyMock.expect(message.get(JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND))
             .andReturn(maps).anyTimes();
         RMProperties rmpsOut = new RMProperties();
         EasyMock.expect(message.get(RMMessageConstants.RM_PROPERTIES_OUTBOUND)).

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
index f390c13..62b35ba 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
@@ -199,7 +199,7 @@ public class ServantTest extends Assert {
 
         maps.setReplyTo(RMUtils.createReference(DECOUPLED_URL));
         
-        message.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, maps);
+        message.put(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND, maps);
         
         CreateSequenceType cs = new CreateSequenceType();
         cs.setAcksTo(org.apache.cxf.ws.addressing.VersionTransformer
@@ -260,7 +260,7 @@ public class ServantTest extends Assert {
 
         maps.setReplyTo(RMUtils.createReference(DECOUPLED_URL));
         
-        message.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, maps);
+        message.put(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND, maps);
 
         TerminateSequenceType ts = new TerminateSequenceType();
         Identifier sid = new Identifier();

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
index dacdc77..1867bd5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
@@ -64,13 +64,13 @@ abstract class STSInvoker implements Invoker {
     
     public Object invoke(Exchange exchange, Object o) {
         AddressingProperties inProps = (AddressingProperties)exchange.getInMessage()
-                .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+                .getContextualProperty(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND);
         if (inProps != null) {
             AddressingProperties props = inProps.createCompatibleResponseProperties();
             AttributedURIType action = new AttributedURIType();
             action.setValue(inProps.getAction().getValue().replace("/RST/", "/RSTR/"));
             props.setAction(action);
-            exchange.getOutMessage().put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND,
props);
+            exchange.getOutMessage().put(JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND,
props);
         }
 
         MessageContentsList lst = (MessageContentsList)o;

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
index d2d50cb..72ae8bb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
@@ -117,7 +117,7 @@ class SecureConversationInInterceptor extends AbstractPhaseInterceptor<SoapMessa
             }
             String addNs = null;
             AddressingProperties inProps = (AddressingProperties)message
-                .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+                .getContextualProperty(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND);
             if (inProps != null) {
                 addNs = inProps.getNamespaceURI();
                 if (s == null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java
index f4e0efa..967f453 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java
@@ -83,7 +83,7 @@ class SpnegoContextTokenInInterceptor extends AbstractPhaseInterceptor<SoapMessa
             }
             String s = (String)message.get(SoapBindingConstants.SOAP_ACTION);
             AddressingProperties inProps = (AddressingProperties)message
-                .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+                .getContextualProperty(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND);
             if (inProps != null && s == null) {
                 //MS/WCF doesn't put a soap action out for this, must check the headers
                 s = inProps.getAction().getValue();

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTInInterceptor.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTInInterceptor.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTInInterceptor.java
index fea6a64..dc9f4e9 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTInInterceptor.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTInInterceptor.java
@@ -42,7 +42,7 @@ public class SCTInInterceptor extends AbstractPhaseInterceptor<SoapMessage>
{
         
         String s = (String)message.get(SoapBindingConstants.SOAP_ACTION);
         AddressingProperties inProps = (AddressingProperties)message
-            .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+            .getContextualProperty(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND);
         if (inProps != null && s == null) {
             //MS/WCF doesn't put a soap action out for this, must check the headers
             s = inProps.getAction().getValue();

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java
index 4a679b0..ecb19fc 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java
@@ -41,9 +41,9 @@ public class SCTOutInterceptor extends AbstractPhaseInterceptor<SoapMessage>
{
     public void handleMessage(SoapMessage message) throws Fault {
         
         AddressingProperties inProps = (AddressingProperties)message
-            .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+            .getContextualProperty(JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND);
         AddressingProperties outProps = (AddressingProperties)message
-            .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND);
+            .getContextualProperty(JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND);
         if (inProps != null) {
             if (outProps == null) {
                 outProps = new AddressingPropertiesImpl(inProps.getNamespaceURI());
@@ -51,7 +51,7 @@ public class SCTOutInterceptor extends AbstractPhaseInterceptor<SoapMessage>
{
             AttributedURIType action = new AttributedURIType();
             action.setValue(inProps.getAction().getValue().replace("/RST/", "/RSTR/"));
             outProps.setAction(action);
-            message.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, outProps);
+            message.put(JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND, outProps);
         }
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
index 6978f7d..743dd0e 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
@@ -52,7 +52,7 @@ public class GreeterImplA extends AbstractGreeterImpl {
         String id = null;
         if (context.getMessageContext() != null) {
             String property =
-                JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
+                JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
             AddressingProperties maps = (AddressingProperties)
                 context.getMessageContext().get(property);
             id = maps != null && maps.getMessageID() != null

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
index f39bfe5..32aff56 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
@@ -41,7 +41,7 @@ import org.apache.hello_world_soap_http.types.SayHiResponse;
 import org.apache.hello_world_soap_http.types.TestDocLitFaultResponse;
 import org.apache.hello_world_soap_http.types.TestNillableResponse;
 
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
 
 public abstract class AbstractGreeterImpl implements Greeter {
     VerificationCache verificationCache;
@@ -122,7 +122,7 @@ public abstract class AbstractGreeterImpl implements Greeter {
 
     private void verifyMAPs() {
         if (context.getMessageContext() != null) {
-            String property = SERVER_ADDRESSING_PROPERTIES_INBOUND;
+            String property = ADDRESSING_PROPERTIES_INBOUND;
             AddressingProperties maps = (AddressingProperties)
                 context.getMessageContext().get(property);
             verificationCache.put(MAPTest.verifyMAPs(maps, this));

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
index 9df099d..c84ad49 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
@@ -50,8 +50,8 @@ import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.soap.VersionTransformer;
 import org.apache.cxf.ws.addressing.v200408.AttributedURI;
 
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND;
 
 
 /**
@@ -195,7 +195,7 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
 
     private boolean isOutgoingPartialResponse(SoapMessage message) {
         AddressingProperties maps = 
-            (AddressingProperties)message.get(SERVER_ADDRESSING_PROPERTIES_OUTBOUND);
+            (AddressingProperties)message.get(ADDRESSING_PROPERTIES_OUTBOUND);
         return ContextUtils.isOutbound(message)
                && !ContextUtils.isRequestor(message)
                && maps != null
@@ -205,7 +205,7 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
     private boolean isIncomingPartialResponse(SoapMessage message) 
         throws SOAPException {
         AddressingProperties maps = 
-            (AddressingProperties)message.get(CLIENT_ADDRESSING_PROPERTIES_INBOUND);
+            (AddressingProperties)message.get(ADDRESSING_PROPERTIES_INBOUND);
         return !ContextUtils.isOutbound(message)
                && ContextUtils.isRequestor(message)
                && maps != null

http://git-wip-us.apache.org/repos/asf/cxf/blob/e381ecf5/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
index 0fd6911..ba9255c 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
@@ -32,8 +32,8 @@ import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
+import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND;
 
 
 /**
@@ -47,8 +47,8 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message>
{
     public MAPVerifier() {
         super(Phase.POST_LOGICAL);
         mapProperties = new HashMap<String, Object>();
-        mapProperties.put(MAPTest.INBOUND_KEY, CLIENT_ADDRESSING_PROPERTIES_INBOUND);
-        mapProperties.put(MAPTest.OUTBOUND_KEY, CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+        mapProperties.put(MAPTest.INBOUND_KEY, ADDRESSING_PROPERTIES_INBOUND);
+        mapProperties.put(MAPTest.OUTBOUND_KEY, ADDRESSING_PROPERTIES_OUTBOUND);
     }
     
     public void handleMessage(Message message) {


Mime
View raw message