You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/12 17:43:03 UTC
svn commit: r1502592 - in /cxf/trunk:
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/
rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/
rt/ws/addr/src/test/java/org/apache/cxf...
Author: dkulp
Date: Fri Jul 12 15:43:02 2013
New Revision: 1502592
URL: http://svn.apache.org/r1502592
Log:
Remove the old "impls"
Removed:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingConstantsImpl.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingPropertiesImpl.java
Modified:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/interceptor/SCTOutInterceptor.java
cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java?rev=1502592&r1=1502591&r2=1502592&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java Fri Jul 12 15:43:02 2013
@@ -340,7 +340,7 @@ final class InternalContextUtils {
// ensure there is a MAPs instance available for the outbound
// partial response that contains appropriate To and ReplyTo
// properties (i.e. anonymous & none respectively)
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
maps.setTo(EndpointReferenceUtils.getAnonymousEndpointReference());
maps.setReplyTo(ContextUtils.WSA_OBJECT_FACTORY.createEndpointReferenceType());
maps.getReplyTo().setAddress(ContextUtils.getAttributedURI(Names.WSA_NONE_ADDRESS));
Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java?rev=1502592&r1=1502591&r2=1502592&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java Fri Jul 12 15:43:02 2013
@@ -1077,7 +1077,7 @@ public class MAPAggregatorImpl extends M
LOG.log(Level.FINE, "MAPs retrieved from message {0}", maps);
if (maps == null && isProviderContext) {
- maps = new AddressingPropertiesImpl();
+ maps = new AddressingProperties();
setupNamespace(maps, message);
}
return maps;
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -68,7 +68,6 @@ 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;
/**
@@ -466,7 +465,7 @@ public class MAPCodec extends AbstractSo
public AddressingProperties unmarshalMAPs(SoapMessage message) {
// REVISIT generate MessageAddressingHeaderRequired fault if an
// expected header is missing
- AddressingPropertiesImpl maps = null;
+ AddressingProperties maps = null;
try {
List<Header> header = message.getHeaders();
if (header != null) {
@@ -491,7 +490,7 @@ public class MAPCodec extends AbstractSo
jaxbContext.createUnmarshaller();
}
if (maps == null) {
- maps = new AddressingPropertiesImpl();
+ maps = new AddressingProperties();
maps.exposeAs(headerURI);
}
String localName = headerElement.getLocalName();
@@ -597,7 +596,7 @@ public class MAPCodec extends AbstractSo
}
private void decodeReferenceParameters(Set<Element> referenceParameterHeaders,
- AddressingPropertiesImpl maps,
+ AddressingProperties maps,
Unmarshaller unmarshaller)
throws JAXBException {
EndpointReferenceType toEpr = maps.getToEndpointReference();
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -22,8 +22,6 @@ 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;
@@ -34,7 +32,7 @@ public class AddressingConstantsImplTest
@Before
public void setUp() {
- constants = new AddressingConstantsImpl();
+ constants = new AddressingConstants();
}
@Test
Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java?rev=1502592&r1=1502591&r2=1502592&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java Fri Jul 12 15:43:02 2013
@@ -83,7 +83,7 @@ public class MAPAggregatorTest extends A
private MAPAggregatorImpl aggregator;
private IMocksControl control;
- private AddressingPropertiesImpl expectedMAPs;
+ private AddressingProperties expectedMAPs;
private String expectedTo;
private String expectedReplyTo;
private String expectedRelatesTo;
@@ -396,7 +396,7 @@ public class MAPAggregatorTest extends A
setUpMessageProperty(message,
REQUESTOR_ROLE,
Boolean.FALSE);
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
EndpointReferenceType replyTo = new EndpointReferenceType();
replyTo.setAddress(ContextUtils.getAttributedURI(Names.WSA_NONE_ADDRESS));
maps.setReplyTo(replyTo);
@@ -423,7 +423,7 @@ public class MAPAggregatorTest extends A
setUpMessageProperty(message,
REQUESTOR_ROLE,
Boolean.TRUE);
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
EndpointReferenceType replyTo = new EndpointReferenceType();
replyTo.setAddress(ContextUtils.getAttributedURI(Names.WSA_ANONYMOUS_ADDRESS));
maps.setReplyTo(replyTo);
@@ -640,8 +640,8 @@ public class MAPAggregatorTest extends A
setUpMessageProperty(message,
REQUESTOR_ROLE,
Boolean.valueOf(Boolean.TRUE));
- AddressingPropertiesImpl maps = mapsInContext
- ? new AddressingPropertiesImpl()
+ AddressingProperties maps = mapsInContext
+ ? new AddressingProperties()
: null;
if (zeroLengthAction) {
maps.setAction(ContextUtils.getAttributedURI(""));
@@ -683,7 +683,7 @@ public class MAPAggregatorTest extends A
setUpMessageProperty(message,
REQUESTOR_ROLE,
Boolean.FALSE);
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
EndpointReferenceType replyTo = new EndpointReferenceType();
replyTo.setAddress(
ContextUtils.getAttributedURI(args.decoupled
@@ -912,14 +912,14 @@ public class MAPAggregatorTest extends A
}
private boolean verifyMAPs(Object obj) {
- if (obj instanceof AddressingPropertiesImpl) {
- AddressingPropertiesImpl other = (AddressingPropertiesImpl)obj;
+ if (obj instanceof AddressingProperties) {
+ AddressingProperties other = (AddressingProperties)obj;
return compareExpected(other);
}
return false;
}
- private boolean compareExpected(AddressingPropertiesImpl other) {
+ private boolean compareExpected(AddressingProperties other) {
boolean ret = false;
if (expectedMAPs == null || expectedMAPs == other) {
boolean toOK =
Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java?rev=1502592&r1=1502591&r2=1502592&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java Fri Jul 12 15:43:02 2013
@@ -30,7 +30,6 @@ import org.apache.cxf.ws.addressing.Addr
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;
@@ -49,7 +48,7 @@ public class DecoupledFaultHandlerTest e
SoapMessage message = new SoapMessage(new MessageImpl());
QName qname = new QName("http://cxf.apache.org/mustunderstand", "TestMU");
message.getHeaders().add(new Header(qname, new Object()));
- AddressingProperties maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
EndpointReferenceType faultTo = new EndpointReferenceType();
faultTo.setAddress(new AttributedURIType());
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -41,17 +41,18 @@ 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.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.EndpointReferenceUtils;
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.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -299,7 +300,7 @@ public class MAPCodecTest extends Assert
: (requestor && !outbound) || (!requestor && outbound);
message.put(REQUESTOR_ROLE, Boolean.valueOf(requestor));
String mapProperty = getMAPProperty(requestor, outbound);
- AddressingPropertiesImpl maps = getMAPs(requestor, outbound, exposeAs);
+ AddressingProperties maps = getMAPs(requestor, outbound, exposeAs);
final Element header = control.createMock(Element.class);
codec.setHeaderFactory(new MAPCodec.HeaderFactory() {
public Element getHeader(SoapVersion version) {
@@ -321,7 +322,7 @@ public class MAPCodecTest extends Assert
}
private void setUpEncode(boolean requestor, SoapMessage message, Element header,
- AddressingPropertiesImpl maps, String mapProperty, boolean invalidMAP,
+ AddressingProperties maps, String mapProperty, boolean invalidMAP,
boolean preExistingSOAPAction) throws Exception {
message.put(mapProperty, maps);
@@ -340,7 +341,7 @@ public class MAPCodecTest extends Assert
}
}
- private void setUpDecode(SoapMessage message, List<Header> headers, AddressingPropertiesImpl maps,
+ private void setUpDecode(SoapMessage message, List<Header> headers, AddressingProperties maps,
String mapProperty, boolean requestor) throws Exception {
Unmarshaller unmarshaller = control.createMock(Unmarshaller.class);
ContextUtils.getJAXBContext().createUnmarshaller();
@@ -402,8 +403,8 @@ public class MAPCodecTest extends Assert
? SERVER_ADDRESSING_PROPERTIES_OUTBOUND : SERVER_ADDRESSING_PROPERTIES_INBOUND;
}
- private AddressingPropertiesImpl getMAPs(boolean requestor, boolean outbound, String uri) {
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ private AddressingProperties getMAPs(boolean requestor, boolean outbound, String uri) {
+ AddressingProperties maps = new AddressingProperties();
boolean exposeAsNative = Names.WSA_NAMESPACE_NAME.equals(uri);
boolean exposeAs200408 = VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(uri);
boolean exposeAs200403 = VersionTransformer.Names200403.WSA_NAMESPACE_NAME.equals(uri);
@@ -501,14 +502,14 @@ public class MAPCodecTest extends Assert
}
private boolean verifyMAPs(Object obj) {
- if (obj instanceof AddressingPropertiesImpl) {
- AddressingPropertiesImpl other = (AddressingPropertiesImpl)obj;
+ if (obj instanceof AddressingProperties) {
+ AddressingProperties other = (AddressingProperties)obj;
return compareExpected(other);
}
return false;
}
- private boolean compareExpected(AddressingPropertiesImpl other) {
+ private boolean compareExpected(AddressingProperties other) {
boolean ret = false;
String uri = other.getNamespaceURI();
boolean exposedAsNative = Names.WSA_NAMESPACE_NAME.equals(uri);
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -58,7 +58,6 @@ import org.apache.cxf.ws.addressing.Cont
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.impl.AddressingPropertiesImpl;
import org.apache.cxf.ws.rm.RMConfiguration.DeliveryAssurance;
import org.apache.cxf.ws.rm.manager.AcksPolicyType;
import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType;
@@ -583,7 +582,7 @@ public class RMManager {
RMContextUtils.storeRMProperties(message, rmps, true);
if (null == conduit) {
String to = m.getTo();
- AddressingProperties maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
maps.setTo(RMUtils.createReference(to));
RMContextUtils.storeMAPs(maps, message, true, false);
}
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -32,7 +32,6 @@ 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.impl.AddressingConstantsImpl;
public final class RMUtils {
@@ -46,7 +45,7 @@ public final class RMUtils {
WSRM_FACTORY = new org.apache.cxf.ws.rm.v200702.ObjectFactory();
WSRM200502_FACTORY = new org.apache.cxf.ws.rm.v200502.ObjectFactory();
WSRM200502_WSA200508_FACTORY = new org.apache.cxf.ws.rm.v200502wsa15.ObjectFactory();
- WSA_CONSTANTS = new AddressingConstantsImpl();
+ WSA_CONSTANTS = new AddressingConstants();
}
private 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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -23,7 +23,6 @@ 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.JAXWSAConstants;
-import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
@@ -133,7 +132,7 @@ public class RMContextUtilsTest extends
public void testRetrieveMAPs() {
Message msg = control.createMock(Message.class);
EasyMock.expect(msg.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.TRUE);
- AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
+ AddressingProperties maps = control.createMock(AddressingProperties.class);
EasyMock.expect(msg.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND)).andReturn(maps);
control.replay();
assertSame(maps, RMContextUtils.retrieveMAPs(msg, false, true));
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -34,17 +34,18 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.ws.addressing.AddressingProperties;
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.VersionTransformer.Names200408;
-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;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -313,7 +314,7 @@ public class RMInInterceptorTest extends
control.reset();
EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
- AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
+ AddressingProperties maps = control.createMock(AddressingProperties.class);
EasyMock.expect(maps.getNamespaceURI()).andReturn(Names200408.WSA_NAMESPACE_NAME).anyTimes();
EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
AttributedURIType actionURI = control.createMock(AttributedURIType.class);
@@ -374,7 +375,7 @@ public class RMInInterceptorTest extends
manager = control.createMock(RMManager.class);
Message message = control.createMock(Message.class);
Exchange exchange = control.createMock(Exchange.class);
- AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
+ AddressingProperties maps = control.createMock(AddressingProperties.class);
interceptor.setManager(manager);
@@ -449,7 +450,7 @@ public class RMInInterceptorTest extends
EasyMock.expect(message.get(RMMessageConstants.RM_PROPERTIES_INBOUND)).andReturn(rmps);
EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(!serverSide);
- AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
+ AddressingProperties maps = control.createMock(AddressingProperties.class);
EasyMock.expect(maps.getNamespaceURI()).andReturn(Names200408.WSA_NAMESPACE_NAME).anyTimes();
EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND)).andReturn(maps);
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -51,7 +51,6 @@ import org.apache.cxf.ws.addressing.Attr
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.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;
@@ -224,7 +223,7 @@ public class RMManagerTest extends Asser
org.apache.cxf.transport.Destination destination = control
.createMock(org.apache.cxf.transport.Destination.class);
EasyMock.expect(exchange.getDestination()).andReturn(destination).anyTimes();
- AddressingPropertiesImpl maps = control.createMock(AddressingPropertiesImpl.class);
+ AddressingProperties maps = control.createMock(AddressingProperties.class);
EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(null);
EasyMock.expect(message.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND))
.andReturn(maps).anyTimes();
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -31,12 +31,12 @@ 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.AddressingProperties;
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.VersionTransformer.Names200408;
-import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
@@ -105,7 +105,7 @@ public class RMOutInterceptorTest extend
@Test
public void testHandleApplicationMessage() throws NoSuchMethodException, SequenceFault, RMException {
- AddressingPropertiesImpl maps = createMAPs("greetMe", "localhost:9000/GreeterPort",
+ AddressingProperties maps = createMAPs("greetMe", "localhost:9000/GreeterPort",
org.apache.cxf.ws.addressing.Names.WSA_NONE_ADDRESS);
Method[] mocked = new Method[] {
AbstractRMInterceptor.class.getDeclaredMethod("getManager", new Class[]{}),
@@ -193,8 +193,8 @@ public class RMOutInterceptorTest extend
control.verify();
}
- private AddressingPropertiesImpl createMAPs(String action, String to, String replyTo) {
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ private AddressingProperties createMAPs(String action, String to, String replyTo) {
+ AddressingProperties maps = new AddressingProperties();
maps.setTo(RMUtils.createReference(to));
EndpointReferenceType epr = RMUtils.createReference(replyTo);
maps.setReplyTo(epr);
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -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.AddressingProperties;
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;
@@ -189,7 +189,7 @@ public class ServantTest extends Assert
message.put(Message.REQUESTOR_ROLE, Boolean.FALSE);
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
String msgId = "urn:uuid:12345-" + Math.random();
AttributedURIType id = ContextUtils.getAttributedURI(msgId);
maps.setMessageID(id);
@@ -250,7 +250,7 @@ public class ServantTest extends Assert
message.put(Message.REQUESTOR_ROLE, Boolean.FALSE);
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
String msgId = "urn:uuid:12345-" + Math.random();
AttributedURIType id = ContextUtils.getAttributedURI(msgId);
maps.setMessageID(id);
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -47,7 +47,6 @@ import org.apache.cxf.message.MessageImp
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.ws.addressing.AddressingProperties;
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;
@@ -380,7 +379,7 @@ public class RMSoapInterceptorTest exten
RMProperties rmps = new RMProperties();
rmps.exposeAs(RM10Constants.NAMESPACE_URI);
RMContextUtils.storeRMProperties(soapMessage, rmps, true);
- AddressingProperties maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
RMContextUtils.storeMAPs(maps, soapMessage, true, false);
ex.setOutMessage(soapMessage);
soapMessage.setExchange(ex);
@@ -393,7 +392,7 @@ public class RMSoapInterceptorTest exten
RMProperties rmps = new RMProperties();
rmps.exposeAs(RM10Constants.NAMESPACE_URI);
RMContextUtils.storeRMProperties(message, rmps, false);
- AddressingProperties maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
RMContextUtils.storeMAPs(maps, message, false, false);
ex.setInMessage(message);
message = new MessageImpl();
@@ -460,7 +459,7 @@ public class RMSoapInterceptorTest exten
RMProperties rmps = new RMProperties();
rmps.exposeAs(RM10Constants.NAMESPACE_URI);
RMContextUtils.storeRMProperties(soapMessage, rmps, false);
- AddressingProperties maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
RMContextUtils.storeMAPs(maps, soapMessage, false, false);
message.put(Message.SCHEMA_VALIDATION_ENABLED, false);
InputStream is = RMSoapInterceptorTest.class.getResourceAsStream(resource);
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -30,7 +30,6 @@ 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.impl.AddressingPropertiesImpl;
import org.apache.cxf.ws.rm.RM10Constants;
import org.apache.cxf.ws.rm.RMContextUtils;
import org.apache.cxf.ws.rm.RMProperties;
@@ -188,7 +187,7 @@ public class SoapFaultFactoryTest extend
RMProperties rmps = new RMProperties();
rmps.exposeAs(RM10Constants.NAMESPACE_URI);
RMContextUtils.storeRMProperties(message, rmps, false);
- AddressingProperties maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
RMContextUtils.storeMAPs(maps, message, false, false);
return message;
}
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -29,7 +29,6 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.ws.addressing.AddressingProperties;
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);
@@ -46,7 +45,7 @@ public class SCTOutInterceptor extends A
.getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND);
if (inProps != null) {
if (outProps == null) {
- outProps = new AddressingPropertiesImpl(inProps.getNamespaceURI());
+ outProps = new AddressingProperties(inProps.getNamespaceURI());
}
AttributedURIType action = new AttributedURIType();
action.setValue(inProps.getAction().getValue().replace("/RST/", "/RSTR/"));
Modified: cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java?rev=1502592&r1=1502591&r2=1502592&view=diff
==============================================================================
--- cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java (original)
+++ cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java Fri Jul 12 15:43:02 2013
@@ -59,7 +59,6 @@ import org.apache.cxf.ws.addressing.Cont
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
import org.apache.cxf.ws.discovery.wsdl.AppSequenceType;
import org.apache.cxf.ws.discovery.wsdl.ByeType;
import org.apache.cxf.ws.discovery.wsdl.HelloType;
@@ -230,7 +229,7 @@ public class WSDiscoveryClient implement
return dispatch;
}
private void addAddressing(BindingProvider p, boolean addSeq, String action) {
- AddressingProperties addrProperties = new AddressingPropertiesImpl();
+ AddressingProperties addrProperties = new AddressingProperties();
if (action != null) {
AttributedURIType act = new AttributedURIType();
act.setValue(action);
Modified: cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java?rev=1502592&r1=1502591&r2=1502592&view=diff
==============================================================================
--- cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java (original)
+++ cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java Fri Jul 12 15:43:02 2013
@@ -66,7 +66,6 @@ import org.apache.cxf.ws.addressing.Attr
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
-import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
import org.apache.cxf.ws.discovery.WSDVersion;
import org.apache.cxf.ws.discovery.WSDiscoveryClient;
import org.apache.cxf.ws.discovery.WSDiscoveryService;
@@ -437,7 +436,7 @@ public class WSDiscoveryServiceImpl impl
private void updateOutputAction(String append) {
AddressingProperties p = ContextUtils.retrieveMAPs(PhaseInterceptorChain.getCurrentMessage(),
false, false);
- AddressingProperties pout = new AddressingPropertiesImpl();
+ AddressingProperties pout = new AddressingProperties();
AttributedURIType action = new AttributedURIType();
action.setValue(p.getAction().getValue() + append);
pout.exposeAs(p.getNamespaceURI());
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java?rev=1502592&r1=1502591&r2=1502592&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java Fri Jul 12 15:43:02 2013
@@ -35,7 +35,6 @@ import org.apache.cxf.ws.addressing.Addr
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.impl.AddressingPropertiesImpl;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
@@ -62,7 +61,7 @@ public class WSAFaultToClientServerTest
Greeter greeter = new SOAPService(wsdl, serviceName).getPort(Greeter.class, new AddressingFeature());
EndpointReferenceType faultTo = new EndpointReferenceType();
- AddressingProperties addrProperties = new AddressingPropertiesImpl();
+ AddressingProperties addrProperties = new AddressingProperties();
AttributedURIType epr = new AttributedURIType();
String faultToAddress = "http://localhost:" + FaultToEndpointServer.FAULT_PORT + "/faultTo";
epr.setValue(faultToAddress);
@@ -96,7 +95,7 @@ public class WSAFaultToClientServerTest
c.getClient().setDecoupledEndpoint("http://localhost:" + FaultToEndpointServer.FAULT_PORT2 + "/sendFaultHere");
EndpointReferenceType faultTo = new EndpointReferenceType();
- AddressingProperties addrProperties = new AddressingPropertiesImpl();
+ AddressingProperties addrProperties = new AddressingProperties();
AttributedURIType epr = new AttributedURIType();
epr.setValue("http://localhost:" + FaultToEndpointServer.FAULT_PORT2 + "/sendFaultHere");
faultTo.setAddress(epr);
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.ws.addr_f
import java.io.ByteArrayOutputStream;
import java.net.URL;
+
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.soap.AddressingFeature;
@@ -30,9 +31,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.AddressingProperties;
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;
@@ -173,7 +174,7 @@ public class WSAFromWSDLTest extends Abs
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + PORT + "/jaxws/addAnon");
- AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
EndpointReferenceType ref = new EndpointReferenceType();
AttributedURIType add = new AttributedURIType();
add.setValue("http://localhost:" + INVALID_PORT + "/not/a/real/url");
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -47,7 +47,6 @@ import org.apache.cxf.ws.addressing.Endp
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
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.hello_world_soap_http.BadRecordLitFault;
import org.apache.hello_world_soap_http.Greeter;
@@ -202,7 +201,7 @@ public abstract class MAPTestBase extend
String msgId = "urn:uuid:12345-" + Math.random();
Map<String, Object> requestContext =
((BindingProvider)greeter).getRequestContext();
- AddressingProperties maps = new AddressingPropertiesImpl();
+ AddressingProperties maps = new AddressingProperties();
AttributedURIType id =
ContextUtils.getAttributedURI(msgId);
maps.setMessageID(id);
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=1502592&r1=1502591&r2=1502592&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 Fri Jul 12 15:43:02 2013
@@ -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.AddressingProperties;
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;
@@ -65,8 +65,8 @@ public class MAPVerifier extends Abstrac
(String)mapProperties.get(isOutbound
? MAPTest.OUTBOUND_KEY
: MAPTest.INBOUND_KEY);
- AddressingPropertiesImpl maps =
- (AddressingPropertiesImpl)message.get(mapProperty);
+ AddressingProperties maps =
+ (AddressingProperties)message.get(mapProperty);
if (maps == null) {
return;
}