cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1230685 [2/2] - in /cxf/trunk: api/src/main/java/org/apache/cxf/ws/addressing/ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/ rt/ws/addr/src/main/java/org/apache/cxf/ws/ad...
Date Thu, 12 Jan 2012 18:31:50 GMT
Copied: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java (from r1230569, cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java?p2=cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java&p1=cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java&r1=1230569&r2=1230685&rev=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java Thu Jan 12 18:31:47 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.ws.addressing;
+package org.apache.cxf.ws.addressing.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,15 +50,12 @@ import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.OneWayProcessorInterceptor;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.FaultInfo;
@@ -71,7 +68,15 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.transport.Observable;
+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.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.MAPAggregator;
+import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
+import org.apache.cxf.ws.addressing.WSAContextUtils;
+import org.apache.cxf.ws.addressing.WSAddressingFeature;
 import org.apache.cxf.ws.addressing.policy.MetadataConstants;
 import org.apache.cxf.ws.policy.AssertionInfo;
 import org.apache.cxf.ws.policy.AssertionInfoMap;
@@ -82,12 +87,7 @@ import org.apache.cxf.wsdl.EndpointRefer
  * Logical Handler responsible for aggregating the Message Addressing 
  * Properties for outgoing messages.
  */
-public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
-    public static final String USING_ADDRESSING = MAPAggregator.class.getName() + ".usingAddressing";
-    public static final String ADDRESSING_DISABLED = MAPAggregator.class.getName() + ".addressingDisabled";
-    public static final String DECOUPLED_DESTINATION = MAPAggregator.class.getName() 
-        + ".decoupledDestination";
-    public static final String ACTION_VERIFIED = MAPAggregator.class.getName() + ".actionVerified";
+public class MAPAggregatorImpl extends MAPAggregator {
     
     private static final Logger LOG = 
         LogUtils.getL7dLogger(MAPAggregator.class);
@@ -109,115 +109,29 @@ public class MAPAggregator extends Abstr
         
     };
 
-    /**
-     * The cache to use for enforcing uniqueness.  Defaults to {@link DefaultMessageIdCache}.
-     */
-    private MessageIdCache messageIdCache = new DefaultMessageIdCache();
-    
-    private boolean usingAddressingAdvisory = true;
-    private boolean addressingRequired;
-
-    private boolean allowDuplicates = true;
-    
-    private String addressingResponses = "ALL";
     
     /**
      * Constructor.
      */
-    public MAPAggregator() {
-        super(Phase.PRE_LOGICAL);
-        addBefore(OneWayProcessorInterceptor.class.getName());
+    public MAPAggregatorImpl() {
+        messageIdCache = new DefaultMessageIdCache();
     }
     
-    /**
-     * Indicates if duplicate messageIDs are allowed.
-     * @return true if duplicate messageIDs are allowed
-     */
-    public boolean allowDuplicates() {
-        return allowDuplicates;
-    }
-
-    /**
-     * Allows/disallows duplicate messageIdDs.  
-     * @param ad whether duplicate messageIDs are allowed
-     */
-    public void setAllowDuplicates(boolean ad) {
-        allowDuplicates = ad;
-    }
 
-    /**
-     * Whether the presence of the <wsaw:UsingAddressing> element
-     * in the WSDL is purely advisory, i.e. its absence doesn't prevent
-     * the encoding of WS-A headers.
-     *
-     * @return true if the presence of the <wsaw:UsingAddressing> element is 
-     * advisory
-     */
-    public boolean isUsingAddressingAdvisory() {
-        return usingAddressingAdvisory;
-    }
-
-    /**
-     * Controls whether the presence of the <wsaw:UsingAddressing> element
-     * in the WSDL is purely advisory, i.e. its absence doesn't prevent
-     * the encoding of WS-A headers.
-     *
-     * @param advisory true if the presence of the <wsaw:UsingAddressing>
-     * element is to be advisory
-     */
-    public void setUsingAddressingAdvisory(boolean advisory) {
-        usingAddressingAdvisory = advisory;
-    }
-    
-    /**
-     * Whether the use of addressing is completely required for this endpoint
-     *
-     * @return true if addressing is required
-     */
-    public boolean isAddressingRequired() {
-        return addressingRequired;
-    }
-    /**
-     * Sets whether the use of addressing is completely required for this endpoint
-     *
-     */
-    public void setAddressingRequired(boolean required) {
-        addressingRequired = required;
-    }
-    
-    /**
-     * Sets Addresing Response 
-     *
-     */
-    public void setAddressingResponses(String responses) {
-        addressingResponses = responses;
-    }
     
-    /**
-     * Returns the cache used to enforce duplicate message IDs when
-     * {@link #allowDuplicates()} returns {@code false}.
-     *
-     * @return the cache used to enforce duplicate message IDs
-     */
-    public MessageIdCache getMessageIdCache() {
-        return messageIdCache;
-    }
-
-    /**
-     * Sets the cache used to enforce duplicate message IDs when
-     * {@link #allowDuplicates()} returns {@code false}.
-     *
-     * @param messageIdCache the cache to use
-     *
-     * @throws NullPointerException if {@code messageIdCache} is {@code null}
-     */
-    public void setMessageIdCache(MessageIdCache messageIdCache) {
+    public MAPAggregatorImpl(MAPAggregator mag) {
+        this.addressingRequired = mag.isAddressingRequired();
+        this.messageIdCache = mag.getMessageIdCache();
         if (messageIdCache == null) {
-            throw new NullPointerException("messageIdCache cannot be null.");
+            messageIdCache = new DefaultMessageIdCache();
         }
-        this.messageIdCache = messageIdCache;
+        this.usingAddressingAdvisory = mag.isUsingAddressingAdvisory();
+        this.allowDuplicates = mag.allowDuplicates();
+        this.addressingResponses = mag.getAddressingResponses();
     }
 
+
+
     /**
      * Invoked for normal processing of inbound and outbound messages.
      *
@@ -516,7 +430,7 @@ public class MAPAggregator extends Abstr
                 // request/response MAPs must be aggregated
                 aggregate(message, isFault);
             }
-            AddressingPropertiesImpl theMaps = 
+            AddressingProperties theMaps = 
                 ContextUtils.retrieveMAPs(message, false, ContextUtils.isOutbound(message));
             if (null != theMaps && ContextUtils.isRequestor(message)) {            
                 assertAddressing(message, 
@@ -525,7 +439,7 @@ public class MAPAggregator extends Abstr
             }
         } else if (!ContextUtils.isRequestor(message)) {
             //responder validates incoming MAPs
-            AddressingPropertiesImpl maps = getMAPs(message, false, false);
+            AddressingProperties maps = getMAPs(message, false, false);
             //check responses          
             if (maps != null) {
                 checkAddressingResponses(maps.getReplyTo(), maps.getFaultTo());
@@ -539,7 +453,7 @@ public class MAPAggregator extends Abstr
             }
             continueProcessing = validateIncomingMAPs(maps, message);
             if (maps != null) {
-                AddressingPropertiesImpl theMaps = 
+                AddressingProperties theMaps = 
                     ContextUtils.retrieveMAPs(message, false, ContextUtils.isOutbound(message));
                 if (null != theMaps) {            
                     assertAddressing(message, theMaps.getReplyTo(), theMaps.getFaultTo());
@@ -547,7 +461,7 @@ public class MAPAggregator extends Abstr
 
                 if (isOneway
                     || !ContextUtils.isGenericAddress(maps.getReplyTo())) {
-                    ContextUtils.rebaseResponse(maps.getReplyTo(),
+                    InternalContextUtils.rebaseResponse(maps.getReplyTo(),
                                                 maps,
                                                 message);
                 } 
@@ -577,7 +491,7 @@ public class MAPAggregator extends Abstr
                                               ContextUtils.retrieveMAPFaultName(message)));
             }
         } else {
-            AddressingPropertiesImpl theMaps = 
+            AddressingProperties theMaps = 
                 ContextUtils.retrieveMAPs(message, false, ContextUtils.isOutbound(message));
             if (null != theMaps) {            
                 assertAddressing(message, theMaps.getReplyTo(), theMaps.getFaultTo());
@@ -628,23 +542,24 @@ public class MAPAggregator extends Abstr
     }
 
     private void checkAddressingResponses(EndpointReferenceType replyTo, EndpointReferenceType faultTo) {
-        if (this.addressingResponses.equals("ALL")) {
+        if (this.addressingResponses == WSAddressingFeature.AddressingResponses.ALL) {
             return;
         }
         boolean passed = false;
         boolean anonReply = ContextUtils.isGenericAddress(replyTo);
         boolean anonFault = ContextUtils.isGenericAddress(faultTo);
         boolean isAnonymous = anonReply && anonFault;
-        if ("ANONYMOUS".equals(addressingResponses) && isAnonymous) {
+        if (WSAddressingFeature.AddressingResponses.ANONYMOUS == addressingResponses
+            && isAnonymous) {
             passed = true;
-        } else if ("NON_ANONYMOUS".equals(addressingResponses)
+        } else if (WSAddressingFeature.AddressingResponses.NON_ANONYMOUS == addressingResponses
                    && (!anonReply && (faultTo.getAddress() != null && !anonFault) 
                        || !anonReply && faultTo.getAddress() == null)) {
             passed = true;
         }
         if (!passed) {
             String reason = BUNDLE.getString("INVALID_ADDRESSING_PROPERTY_MESSAGE");
-            QName detail = "ANONYMOUS".equals(addressingResponses)
+            QName detail = WSAddressingFeature.AddressingResponses.ANONYMOUS == addressingResponses
                 ? Names.ONLY_ANONYMOUS_ADDRESS_SUPPORTED_QNAME
                 : Names.ONLY_NONANONYMOUS_ADDRESS_SUPPORTED_QNAME;
             throw new SoapFault(reason, detail);
@@ -659,7 +574,7 @@ public class MAPAggregator extends Abstr
     private void aggregate(Message message, boolean isFault) {
         boolean isRequestor = ContextUtils.isRequestor(message);
 
-        AddressingPropertiesImpl maps = assembleGeneric(message);
+        AddressingProperties maps = assembleGeneric(message);
         addRoleSpecific(maps, message, isRequestor, isFault);
         // outbound property always used to store MAPs, as this handler 
         // aggregates only when either:
@@ -676,8 +591,8 @@ public class MAPAggregator extends Abstr
      * @param message the current message
      * @return AddressingProperties containing the generic MAPs
      */
-    private AddressingPropertiesImpl assembleGeneric(Message message) {
-        AddressingPropertiesImpl maps = getMAPs(message, true, true);
+    private AddressingProperties assembleGeneric(Message message) {
+        AddressingProperties maps = getMAPs(message, true, true);
         // MessageID
         if (maps.getMessageID() == null) {
             String messageID = ContextUtils.generateUUID();
@@ -686,7 +601,7 @@ public class MAPAggregator extends Abstr
 
         // Action
         if (ContextUtils.hasEmptyAction(maps)) {
-            maps.setAction(ContextUtils.getAction(message));
+            maps.setAction(InternalContextUtils.getAction(message));
 
             if (ContextUtils.hasEmptyAction(maps)
                 && ContextUtils.isOutbound(message)) {
@@ -701,7 +616,7 @@ public class MAPAggregator extends Abstr
         MessageInfo inputMessage = operation.getInput();
 
         if (inputMessage.getExtensionAttributes() != null) {
-            String inputAction = ContextUtils.getAction(inputMessage);
+            String inputAction = InternalContextUtils.getAction(inputMessage);
             if (!StringUtils.isEmpty(inputAction)) {
                 return inputAction;
             }
@@ -712,7 +627,7 @@ public class MAPAggregator extends Abstr
     private String getActionFromOutputMessage(final OperationInfo operation) {
         MessageInfo outputMessage = operation.getOutput();
         if (outputMessage != null && outputMessage.getExtensionAttributes() != null) {
-            String outputAction = ContextUtils.getAction(outputMessage);
+            String outputAction = InternalContextUtils.getAction(outputMessage);
             if (!StringUtils.isEmpty(outputAction)) {
                 return outputAction;
             }
@@ -739,7 +654,7 @@ public class MAPAggregator extends Abstr
             for (FaultInfo faultInfo : operation.getFaults()) {
                 if (isSameFault(faultInfo, faultName)) {
                     if (faultInfo.getExtensionAttributes() != null) {
-                        String faultAction = ContextUtils.getAction(faultInfo);
+                        String faultAction = InternalContextUtils.getAction(faultInfo);
                         if (!StringUtils.isEmpty(faultAction)) {
                             return faultAction;
                         }
@@ -809,7 +724,7 @@ public class MAPAggregator extends Abstr
         } else if (inMsg) {
             String explicitAction = getActionFromInputMessage(op);
             if (StringUtils.isEmpty(explicitAction)) {
-                SoapOperationInfo soi = ContextUtils.getSoapOperationInfo(bop);
+                SoapOperationInfo soi = InternalContextUtils.getSoapOperationInfo(bop);
                 explicitAction = soi == null ? null : soi.getAction();
             }            
             
@@ -861,7 +776,7 @@ public class MAPAggregator extends Abstr
      * requestor 
      * @param isFault true if a fault is being mediated
      */
-    private void addRoleSpecific(AddressingPropertiesImpl maps, 
+    private void addRoleSpecific(AddressingProperties maps, 
                                  Message message,
                                  boolean isRequestor,
                                  boolean isFault) {
@@ -926,7 +841,7 @@ public class MAPAggregator extends Abstr
             }
         } else {
             // add response-specific MAPs
-            AddressingPropertiesImpl inMAPs = getMAPs(message, false, false);
+            AddressingProperties inMAPs = getMAPs(message, false, false);
             maps.exposeAs(inMAPs.getNamespaceURI());
             // To taken from ReplyTo or FaultTo in incoming MAPs (depending
             // on the fault status of the response)
@@ -954,7 +869,7 @@ public class MAPAggregator extends Abstr
  
             if (isFault
                 && !ContextUtils.isGenericAddress(inMAPs.getFaultTo())) {
-                ContextUtils.rebaseResponse(inMAPs.getFaultTo(),
+                InternalContextUtils.rebaseResponse(inMAPs.getFaultTo(),
                                             inMAPs,
                                             message);
             }
@@ -1108,11 +1023,11 @@ public class MAPAggregator extends Abstr
      * @param isOutbound true iff the message is outbound
      * @return AddressingProperties retrieved MAPs
      */
-    private AddressingPropertiesImpl getMAPs(Message message,
+    private AddressingProperties getMAPs(Message message,
                                              boolean isProviderContext,
                                              boolean isOutbound) {
 
-        AddressingPropertiesImpl maps = null;
+        AddressingProperties maps = null;
         maps = ContextUtils.retrieveMAPs(message, 
                                          isProviderContext,
                                          isOutbound);
@@ -1125,7 +1040,7 @@ public class MAPAggregator extends Abstr
         return maps;
     }
 
-    private void setupNamespace(AddressingPropertiesImpl maps, Message message) {
+    private void setupNamespace(AddressingProperties maps, Message message) {
         AssertionInfoMap aim = message.get(AssertionInfoMap.class);
         if (null == aim) {
             return;

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java (from r1230569, cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java?p2=cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java&p1=cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java&r1=1230569&r2=1230685&rev=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java Thu Jan 12 18:31:47 2012
@@ -16,23 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.ws.addressing;
+
+package org.apache.cxf.ws.addressing.impl;
+
+import org.apache.cxf.ws.addressing.MAPAggregator;
+import org.apache.cxf.ws.addressing.MAPAggregator.MAPAggregatorLoader;
 
 /**
- * Interface abstracting various ID caches for enforcement of ID uniqueness.
+ * 
  */
-public interface MessageIdCache {
-    
-    /**
-     * Check {@code messageId} for uniqueness against previously
-     * encountered values and cache the ID.  Note that the retention
-     * policy for previously encountered values is implementation specific.
-     * 
-     * @param messageId the message ID to check for uniqueness and cache for
-     *                  future comparison
-     *
-     * @return true if and only if {@code messageId} is not already in the
-     *         cache
-     */
-    boolean checkUniquenessAndCacheId(String messageId);
+public class MAPAggregatorImplLoader implements MAPAggregatorLoader {
+
+    /** {@inheritDoc}*/
+    @Override
+    public MAPAggregator createImplementation(MAPAggregator mag) {
+        return new MAPAggregatorImpl(mag);
+    }
+
 }

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/Messages.properties (from r1230569, cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/Messages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/Messages.properties?p2=cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/Messages.properties&p1=cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/Messages.properties&r1=1230569&r2=1230685&rev=1230685&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java Thu Jan 12 18:31:47 2012
@@ -25,6 +25,7 @@ import java.util.Collection;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.ws.addressing.MAPAggregator;
+import org.apache.cxf.ws.addressing.impl.MAPAggregatorImpl;
 import org.apache.cxf.ws.addressing.soap.MAPCodec;
 import org.apache.cxf.ws.policy.AbstractPolicyInterceptorProvider;
 
@@ -37,7 +38,7 @@ public class AddressingPolicyInterceptor
 
     private static final long serialVersionUID = -1018053541795476992L;
     private static final Collection<QName> ASSERTION_TYPES;
-    private static final MAPAggregator MAP_AGGREGATOR = new MAPAggregator();
+    private static final MAPAggregator MAP_AGGREGATOR = new MAPAggregatorImpl();
     private static final MAPCodec MAP_CODEC = new MAPCodec();
     
     static {

Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Thu Jan 12 18:31:47 2012
@@ -56,7 +56,6 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.phase.Phase;
 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;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -66,6 +65,7 @@ import org.apache.cxf.ws.addressing.Name
 import org.apache.cxf.ws.addressing.ReferenceParametersType;
 import org.apache.cxf.ws.addressing.RelatesToType;
 import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 
 
@@ -183,7 +183,7 @@ public class MAPCodec extends AbstractSo
      * @param maps the MAPs to encode
      */
     private void encode(SoapMessage message, 
-                        AddressingPropertiesImpl maps) {
+                        AddressingProperties maps) {
         if (maps != null) { 
             cacheExchange(message, maps);
             LOG.log(Level.FINE, "Outbound WS-Addressing headers");
@@ -416,7 +416,7 @@ public class MAPCodec extends AbstractSo
     private void addMustUnderstandAttribute(Element header,
                                             QName name,
                                             SoapMessage msg,
-                                            AddressingPropertiesImpl maps) {
+                                            AddressingProperties maps) {
         if (maps.getMustUnderstand().contains(name)) {
             Element lastAdded = (Element)header.getLastChild();
             String pfx = lastAdded.lookupPrefix(msg.getVersion().getNamespace());
@@ -453,7 +453,7 @@ public class MAPCodec extends AbstractSo
      * @param header the SOAP header element
      * @param marshaller the JAXB marshaller to use
      */
-    private <T> void encodeAsExposed(AddressingPropertiesImpl maps,
+    private <T> void encodeAsExposed(AddressingProperties maps,
                                      SoapMessage message,
                                      T value,
                                      QName name,

Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java Thu Jan 12 18:31:47 2012
@@ -28,7 +28,7 @@ import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.transport.Destination;
-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.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.Names;
@@ -63,7 +63,7 @@ public class OneWayDecoupledFaultHandler
             
             Exchange exchange = message.getExchange();
             Message inMessage = exchange.getInMessage();
-            final AddressingPropertiesImpl maps = 
+            final AddressingProperties maps = 
                 ContextUtils.retrieveMAPs(inMessage, false, false, true);
             
             if (maps != null && !ContextUtils.isGenericAddress(maps.getFaultTo())) {

Modified: cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Jan 12 18:31:47 2012
@@ -1,4 +1,6 @@
 org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder::true:true
 org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder::true:true
 org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider::true:true
-org.apache.cxf.ws.addressing.AddressingWSDLExtensionLoader::true:true
+org.apache.cxf.ws.addressing.impl.AddressingWSDLExtensionLoader::true:true
+org.apache.cxf.ws.addressing.impl.AddressingFeatureApplier:org.apache.cxf.ws.addressing.WSAddressingFeature$WSAddressingFeatureApplier:true:true
+org.apache.cxf.ws.addressing.impl.MAPAggregatorImplLoader:org.apache.cxf.ws.addressing.MAPAggregator$MAPAggregatorLoader:true:true
\ No newline at end of file

Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java Thu Jan 12 18:31:47 2012
@@ -19,6 +19,8 @@
 
 package org.apache.cxf.ws.addressing;
 
+import org.apache.cxf.ws.addressing.impl.AddressingBuilderImpl;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java Thu Jan 12 18:31:47 2012
@@ -22,6 +22,8 @@ package org.apache.cxf.ws.addressing;
 
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.ws.addressing.impl.AddressingConstantsImpl;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -167,13 +169,6 @@ public class AddressingConstantsImplTest
     }
 
     @Test
-    public void testGetPackageName() throws Exception {
-        assertEquals("unexpected constant",
-                     "org.apache.cxf.ws.addressing",
-                     constants.getPackageName());
-    }
-
-    @Test
     public void testGetIsReferenceParameterQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",

Copied: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java (from r1230569, cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java?p2=cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java&p1=cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java&r1=1230569&r2=1230685&rev=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java Thu Jan 12 18:31:47 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.ws.addressing;
+package org.apache.cxf.ws.addressing.impl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,6 +27,8 @@ import javax.xml.namespace.QName;
 import junit.framework.Assert;
 
 import org.apache.cxf.service.model.Extensible;
+import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.Names;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 
@@ -60,7 +62,7 @@ public class ContextUtilsTest extends As
             andReturn("urn:foo:test:1");
         control.replay();
         
-        String action = ContextUtils.getAction(ext);
+        String action = InternalContextUtils.getAction(ext);
         assertEquals("urn:foo:test:1", action);
         
         control.reset();
@@ -71,7 +73,7 @@ public class ContextUtilsTest extends As
         attributes.put(WSA_ACTION_QNAME, "urn:foo:test:2");
         control.replay();
         
-        action = ContextUtils.getAction(ext);
+        action = InternalContextUtils.getAction(ext);
         assertEquals("urn:foo:test:2", action);
         
         control.reset();
@@ -82,7 +84,7 @@ public class ContextUtilsTest extends As
         attributes.put(OLD_WSDL_WSA_ACTION_QNAME, "urn:foo:test:3");
         control.replay();
         
-        action = ContextUtils.getAction(ext);
+        action = InternalContextUtils.getAction(ext);
         assertEquals("urn:foo:test:3", action);
         
         control.reset();
@@ -92,7 +94,7 @@ public class ContextUtilsTest extends As
             andReturn(null);
         control.replay();
         
-        action = ContextUtils.getAction(ext);
+        action = InternalContextUtils.getAction(ext);
         assertEquals(null, action);
     }
 }

Propchange: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java (from r1230569, cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java?p2=cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java&p1=cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java&r1=1230569&r2=1230685&rev=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java Thu Jan 12 18:31:47 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.ws.addressing;
+package org.apache.cxf.ws.addressing.impl;
 
 
 import java.lang.reflect.Method;
@@ -59,6 +59,12 @@ import org.apache.cxf.service.model.Serv
 
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
+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.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.Names;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 
@@ -77,7 +83,7 @@ import static org.apache.cxf.ws.addressi
 
 public class MAPAggregatorTest extends Assert {
 
-    private MAPAggregator aggregator;
+    private MAPAggregatorImpl aggregator;
     private IMocksControl control;
     private AddressingPropertiesImpl expectedMAPs;
     private String expectedTo;
@@ -87,7 +93,7 @@ public class MAPAggregatorTest extends A
     
     @Before
     public void setUp() {
-        aggregator = new MAPAggregator();
+        aggregator = new MAPAggregatorImpl();
         control = EasyMock.createNiceControl();
     }
 

Propchange: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java Thu Jan 12 18:31:47 2012
@@ -43,12 +43,12 @@ import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.RelatesToType;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.v200408.AttributedURI;
 import org.apache.cxf.ws.addressing.v200408.Relationship;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;

Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java Thu Jan 12 18:31:47 2012
@@ -27,10 +27,10 @@ import org.apache.cxf.message.ExchangeIm
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.transport.Destination;
 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;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java Thu Jan 12 18:31:47 2012
@@ -34,7 +34,7 @@ import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
+import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.v200702.AckRequestedType;
@@ -181,7 +181,7 @@ public class Destination extends Abstrac
         // can be added we need to send an out-of-band
         // SequenceAcknowledgement message
 
-        AddressingPropertiesImpl maps = RMContextUtils.retrieveMAPs(message, false, false);
+        AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false);
         String replyToAddress = null;
         if (null != maps.getReplyTo()) {
             replyToAddress = maps.getReplyTo().getAddress().getValue();

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java Thu Jan 12 18:31:47 2012
@@ -22,7 +22,6 @@ package org.apache.cxf.ws.rm;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 
 /**
  * Holder for utility methods relating to contexts.
@@ -114,8 +113,9 @@ public final class RMContextUtils {
      * @param isOutbound true if the message is outbound
      * @return the current addressing properties
      */
-    public static AddressingPropertiesImpl retrieveMAPs(Message message, boolean isProviderContext,
-                                                        boolean isOutbound) {
+    public static AddressingProperties retrieveMAPs(Message message, 
+                                                    boolean isProviderContext,
+                                                    boolean isOutbound) {
         return org.apache.cxf.ws.addressing.ContextUtils.retrieveMAPs(message, isProviderContext, isOutbound);
     }
 

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Thu Jan 12 18:31:47 2012
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.message.Message;
-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;
@@ -55,7 +55,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 = RMContextUtils.retrieveMAPs(message, false, false);
         if (null == maps) {
             return;
         }

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Thu Jan 12 18:31:47 2012
@@ -54,12 +54,12 @@ import org.apache.cxf.service.model.Inte
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.MAPAggregator;
 import org.apache.cxf.ws.addressing.RelatesToType;
 import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType;
 import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
 import org.apache.cxf.ws.rm.manager.SourcePolicyType;
@@ -328,7 +328,7 @@ public class RMManager {
             org.apache.cxf.transport.Destination destination = message.getExchange().getDestination();
             EndpointReferenceType replyTo = null;
             if (null != destination) {
-                AddressingPropertiesImpl maps = RMContextUtils.retrieveMAPs(message, false, false);
+                AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false);
                 replyTo = maps.getReplyTo();
             }
             Endpoint ei = message.getExchange().get(Endpoint.class);
@@ -353,7 +353,7 @@ public class RMManager {
     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 = RMContextUtils.retrieveMAPs(message, false, false);
             if (maps != null) {
                 addrUri = maps.getNamespaceURI();
             }
@@ -414,7 +414,7 @@ public class RMManager {
             RelatesToType relatesTo = null;
             if (isServer) {
 
-                AddressingPropertiesImpl inMaps = RMContextUtils.retrieveMAPs(message, false, false);
+                AddressingProperties inMaps = RMContextUtils.retrieveMAPs(message, false, false);
                 inMaps.exposeAs(getRMAddressingNamespace());
                 acksTo = RMUtils.createReference(inMaps.getTo().getValue());
                 to = inMaps.getReplyTo();

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Thu Jan 12 18:31:47 2012
@@ -28,7 +28,7 @@ import org.apache.cxf.common.logging.Log
 import org.apache.cxf.message.FaultMode;
 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.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.MAPAggregator;
@@ -55,7 +55,7 @@ public class RMOutInterceptor extends Ab
             return;
         }
        
-        AddressingPropertiesImpl maps = RMContextUtils.retrieveMAPs(msg, false, true);
+        AddressingProperties maps = RMContextUtils.retrieveMAPs(msg, false, true);
         if (null == maps) {
             LogUtils.log(LOG, Level.WARNING, "MAPS_RETRIEVAL_FAILURE_MSG");
             return;

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java Thu Jan 12 18:31:47 2012
@@ -30,7 +30,7 @@ import org.apache.cxf.io.WriteOnCloseOut
 import org.apache.cxf.management.ManagementConstants;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.ws.addressing.AddressingConstants;
-import org.apache.cxf.ws.addressing.AddressingConstantsImpl;
+import org.apache.cxf.ws.addressing.impl.AddressingConstantsImpl;
 
 public final class RMUtils {
    

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java Thu Jan 12 18:31:47 2012
@@ -22,8 +22,8 @@ package org.apache.cxf.ws.rm;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.junit.After;

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java Thu Jan 12 18:31:47 2012
@@ -32,10 +32,10 @@ import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
 import org.apache.cxf.ws.addressing.MAPAggregator;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.policy.AssertionInfoMap;
 import org.apache.cxf.ws.rm.v200702.CreateSequenceResponseType;
 import org.apache.cxf.ws.rm.v200702.Identifier;

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java Thu Jan 12 18:31:47 2012
@@ -48,12 +48,12 @@ import org.apache.cxf.service.model.Inte
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.transport.Conduit;
 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.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
 import org.apache.cxf.ws.addressing.RelatesToType;
 import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.rm.manager.SequenceTerminationPolicyType;
 import org.apache.cxf.ws.rm.manager.SourcePolicyType;
 import org.apache.cxf.ws.rm.persistence.RMMessage;

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java Thu Jan 12 18:31:47 2012
@@ -31,11 +31,11 @@ import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
 import org.apache.cxf.ws.addressing.MAPAggregator;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.rm.v200702.Identifier;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java Thu Jan 12 18:31:47 2012
@@ -29,10 +29,10 @@ import org.apache.cxf.message.ExchangeIm
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageContentsList;
 import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.rm.manager.AcksPolicyType;
 import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
 import org.apache.cxf.ws.rm.v200502.CreateSequenceResponseType;

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java Thu Jan 12 18:31:47 2012
@@ -46,8 +46,8 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.Names;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.rm.RM10Constants;
 import org.apache.cxf.ws.rm.RMConstants;
 import org.apache.cxf.ws.rm.RMContextUtils;

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java Thu Jan 12 18:31:47 2012
@@ -30,7 +30,7 @@ import org.apache.cxf.binding.soap.SoapF
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.rm.RM10Constants;
 import org.apache.cxf.ws.rm.RMContextUtils;
 import org.apache.cxf.ws.rm.RMProperties;

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java Thu Jan 12 18:31:47 2012
@@ -39,7 +39,6 @@ import org.apache.cxf.message.MessageCon
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 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.JAXWSAConstants;
 import org.apache.cxf.ws.security.SecurityConstants;
@@ -67,7 +66,7 @@ abstract class STSInvoker implements Inv
         AddressingProperties inProps = (AddressingProperties)exchange.getInMessage()
                 .getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
         if (inProps != null) {
-            AddressingProperties props = new AddressingPropertiesImpl(inProps.getNamespaceURI());
+            AddressingProperties props = inProps.createCompatibleResponseProperties();
             AttributedURIType action = new AttributedURIType();
             action.setValue(inProps.getAction().getValue().replace("/RST/", "/RSTR/"));
             props.setAction(action);

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java (original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java Thu Jan 12 18:31:47 2012
@@ -27,9 +27,9 @@ import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 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.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 
 public class SCTOutInterceptor extends AbstractPhaseInterceptor<SoapMessage> {
     static final Logger LOG = LogUtils.getL7dLogger(SCTOutInterceptor.class);

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java Thu Jan 12 18:31:47 2012
@@ -30,9 +30,9 @@ import org.apache.cxf.systest.ws.Abstrac
 import org.apache.cxf.systest.ws.addr_feature.AddNumbersFault_Exception;
 import org.apache.cxf.systest.ws.addr_feature.AddNumbersPortType;
 import org.apache.cxf.systest.ws.addr_feature.AddNumbersService;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java Thu Jan 12 18:31:47 2012
@@ -40,12 +40,12 @@ import org.apache.cxf.jaxws.support.Serv
 import org.apache.cxf.message.Message;
 import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
 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;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.ReferenceParametersType;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.soap.VersionTransformer;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.apache.hello_world_soap_http.BadRecordLitFault;

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java Thu Jan 12 18:31:47 2012
@@ -28,9 +28,9 @@ import java.util.Map;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 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;

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java?rev=1230685&r1=1230684&r2=1230685&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java Thu Jan 12 18:31:47 2012
@@ -34,8 +34,8 @@ import org.apache.cxf.jaxws.JaxWsServerF
 import org.apache.cxf.message.Message;
 import org.apache.cxf.test.AbstractCXFTest;
 import org.apache.cxf.testutil.common.TestUtil;
-import org.apache.cxf.ws.addressing.DefaultMessageIdCache;
 import org.apache.cxf.ws.addressing.MAPAggregator;
+import org.apache.cxf.ws.addressing.impl.DefaultMessageIdCache;
 import org.apache.cxf.ws.addressing.soap.MAPCodec;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.GreeterImpl;



Mime
View raw message