Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 636B59683 for ; Tue, 28 Feb 2012 20:54:16 +0000 (UTC) Received: (qmail 30079 invoked by uid 500); 28 Feb 2012 20:54:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30026 invoked by uid 500); 28 Feb 2012 20:54:16 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 30017 invoked by uid 99); 28 Feb 2012 20:54:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 20:54:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 20:54:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B4E972388AB8; Tue, 28 Feb 2012 20:53:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1294828 - in /cxf/trunk/rt/ws/rm/src: main/java/org/apache/cxf/ws/rm/ main/java/org/apache/cxf/ws/rm/blueprint/ main/java/org/apache/cxf/ws/rm/feature/ main/java/org/apache/cxf/ws/rm/policy/ main/java/org/apache/cxf/ws/rm/soap/ main/java/o... Date: Tue, 28 Feb 2012 20:53:53 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120228205353.B4E972388AB8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Feb 28 20:53:52 2012 New Revision: 1294828 URL: http://svn.apache.org/viewvc?rev=1294828&view=rev Log: Added support for configuring WS-RM WS-Addressing version via Spring and Blueprint Merged on behalf of Dennis Sosnoski Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.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/blueprint/RMBPBeanDefinitionParser.java cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/feature/RMFeature.java cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java Tue Feb 28 20:53:52 2012 @@ -23,6 +23,8 @@ package org.apache.cxf.ws.rm; * Supported protocol variations. */ public enum ProtocolVariation { + + // these must be ordered so the default WS-A namespace is first for a particular WS-RM namespace RM10WSA200408(EncoderDecoder10Impl.INSTANCE, RM10Constants.INSTANCE), RM10WSA200508(EncoderDecoder10AImpl.INSTANCE, RM10Constants.INSTANCE), RM11WSA200508(EncoderDecoder11Impl.INSTANCE, RM11Constants.INSTANCE); @@ -52,15 +54,18 @@ public enum ProtocolVariation { } /** - * Get the information for a supported version of WS-ReliableMessaging and WS-Addressing. + * Get the information for a supported version of WS-ReliableMessaging and WS-Addressing. If the WS-A + * namespace is not specified this just returns the first match on the WS-RM namespace, which should + * always be the default. * * @param wsrm WS-RM namespace URI - * @param wsa WS-A namespace URI + * @param wsa WS-A namespace URI (null if not specified) * @return variant (null if not a supported version) */ public static ProtocolVariation findVariant(String wsrm, String wsa) { for (ProtocolVariation variant : ProtocolVariation.values()) { - if (variant.getWSRMNamespace().equals(wsrm) && variant.getWSANamespace().equals(wsa)) { + if (variant.getWSRMNamespace().equals(wsrm) + && (wsa == null || variant.getWSANamespace().equals(wsa))) { return variant; } } 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=1294828&r1=1294827&r2=1294828&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 Tue Feb 28 20:53:52 2012 @@ -58,10 +58,10 @@ 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.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.RM10AddressingNamespaceType; import org.apache.cxf.ws.rm.manager.SourcePolicyType; import org.apache.cxf.ws.rm.persistence.RMMessage; import org.apache.cxf.ws.rm.persistence.RMStore; @@ -112,7 +112,7 @@ public class RMManager { private InstrumentationManager instrumentationManager; private ManagedRMManager managedManager; private String rmNamespace = RM10Constants.NAMESPACE_URI; - private String rmAddressingNamespace = Names200408.WSA_NAMESPACE_NAME; + private RM10AddressingNamespaceType rm10AddressingNamespace; public RMManager() { setEndpointMaps(new HashMap>()); @@ -137,9 +137,7 @@ public class RMManager { return; } String id = RMUtils.getEndpointIdentifier(client.getEndpoint()); - - ProtocolVariation protocol = ProtocolVariation.findVariant(getRMNamespace(), - getRMAddressingNamespace()); + ProtocolVariation protocol = getConfiguredProtocol(); Collection sss = store.getSourceSequences(id, protocol); if (null == sss || 0 == sss.size()) { return; @@ -147,6 +145,11 @@ public class RMManager { LOG.log(Level.FINE, "Number of source sequences: {0}", sss.size()); recoverReliableEndpoint(client.getEndpoint(), client.getConduit(), protocol); } + + private ProtocolVariation getConfiguredProtocol() { + String addrns = rm10AddressingNamespace == null ? null : rm10AddressingNamespace.getUri(); + return ProtocolVariation.findVariant(getRMNamespace(), addrns); + } public void clientDestroyed(Client client) { shutdownReliableEndpoint(client.getEndpoint()); @@ -162,12 +165,12 @@ public class RMManager { rmNamespace = uri; } - public String getRMAddressingNamespace() { - return rmAddressingNamespace; + public RM10AddressingNamespaceType getRMAddressingNamespace() { + return rm10AddressingNamespace; } - public void setRMAddressingNamespace(String uri) { - rmAddressingNamespace = uri; + public void setRM10AddressingNamespace(RM10AddressingNamespaceType addrns) { + rm10AddressingNamespace = addrns; } public Bus getBus() { @@ -350,7 +353,7 @@ public class RMManager { * @param message * @return namespace URI */ - String getAddressingNamespace(Message message) { + public String getAddressingNamespace(Message message) { String addrUri = (String)message.getContextualProperty(WSRM_WSA_VERSION_PROPERTY); if (addrUri == null) { AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false); @@ -358,7 +361,7 @@ public class RMManager { addrUri = maps.getNamespaceURI(); } if (addrUri == null) { - addrUri = getRMAddressingNamespace(); + addrUri = getConfiguredProtocol().getWSANamespace(); } } return addrUri; @@ -413,9 +416,8 @@ public class RMManager { EndpointReferenceType acksTo = null; RelatesToType relatesTo = null; if (isServer) { - AddressingProperties inMaps = RMContextUtils.retrieveMAPs(message, false, false); - inMaps.exposeAs(getRMAddressingNamespace()); + inMaps.exposeAs(getConfiguredProtocol().getWSANamespace()); acksTo = RMUtils.createReference(inMaps.getTo().getValue()); to = inMaps.getReplyTo(); source.getReliableEndpoint().getServant().setUnattachedIdentifier(inSeqId); Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java Tue Feb 28 20:53:52 2012 @@ -30,6 +30,7 @@ import org.apache.cxf.configuration.blue import org.apache.cxf.ws.rm.RMManager; import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType; import org.apache.cxf.ws.rm.manager.DestinationPolicyType; +import org.apache.cxf.ws.rm.manager.RM10AddressingNamespaceType; import org.apache.cxf.ws.rm.manager.SourcePolicyType; import org.osgi.service.blueprint.reflect.Metadata; @@ -63,6 +64,8 @@ public class RMBPBeanDefinitionParser ex new QName(RM_NS, "sourcePolicy"), "sourcePolicy", SourcePolicyType.class); mapElementToJaxbProperty(context, bean, element, new QName(RM_NS, "destinationPolicy"), "destinationPolicy", DestinationPolicyType.class); + mapElementToJaxbProperty(context, bean, element, new QName(RM_NS, "RM10AddressingNamespace"), + "RM10AddressingNamespace", RM10AddressingNamespaceType.class); mapElementToJaxbProperty(context, bean, element, new QName("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", "RMAssertion"), "RMAssertion", @@ -70,7 +73,7 @@ public class RMBPBeanDefinitionParser ex mapElementToJaxbProperty(context, bean, element, new QName("http://docs.oasis-open.org/ws-rx/wsrmp/200702", "RMAssertion"), "RMAssertion", - org.apache.cxf.ws.rmp.v200502.RMAssertion.class); + org.apache.cxf.ws.rmp.v200702.RMAssertion.class); parseAttributes(element, context, bean); parseChildElements(element, context, bean); @@ -89,8 +92,6 @@ public class RMBPBeanDefinitionParser ex protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) { if ("store".equals(name)) { setFirstChildAsProperty(el, ctx, bean, name); - } else if ("addressingNamespace".equals(name)) { - bean.addProperty("addressingNamespace", createValue(ctx, el.getTextContent())); } } } Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java Tue Feb 28 20:53:52 2012 @@ -41,6 +41,9 @@ public class RMBPHandler implements Name } else if ("http://schemas.xmlsoap.org/ws/2005/02/rm/policy".equals(s)) { return getClass().getClassLoader(). getResource("/schemas/configuration/wsrm-policy.xsd"); + } else if ("http://docs.oasis-open.org/ws-rx/wsrmp/200702".equals(s)) { + return getClass().getClassLoader(). + getResource("/schemas/configuration/wsrmp-1.1-schema-200702.xsd"); } return null; } Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/feature/RMFeature.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/feature/RMFeature.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/feature/RMFeature.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/feature/RMFeature.java Tue Feb 28 20:53:52 2012 @@ -23,8 +23,6 @@ import org.apache.cxf.Bus; import org.apache.cxf.common.injection.NoJSR250Annotations; import org.apache.cxf.feature.AbstractFeature; import org.apache.cxf.interceptor.InterceptorProvider; -import org.apache.cxf.ws.addressing.VersionTransformer.Names200408; -import org.apache.cxf.ws.rm.RM10Constants; import org.apache.cxf.ws.rm.RMCaptureInInterceptor; import org.apache.cxf.ws.rm.RMDeliveryInterceptor; import org.apache.cxf.ws.rm.RMInInterceptor; @@ -32,6 +30,7 @@ import org.apache.cxf.ws.rm.RMManager; import org.apache.cxf.ws.rm.RMOutInterceptor; import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType; import org.apache.cxf.ws.rm.manager.DestinationPolicyType; +import org.apache.cxf.ws.rm.manager.RM10AddressingNamespaceType; import org.apache.cxf.ws.rm.manager.SourcePolicyType; import org.apache.cxf.ws.rm.persistence.RMStore; import org.apache.cxf.ws.rm.soap.RMSoapInterceptor; @@ -47,6 +46,8 @@ public class RMFeature extends AbstractF private DeliveryAssuranceType deliveryAssurance; private SourcePolicyType sourcePolicy; private DestinationPolicyType destinationPolicy; + private String rmNamespace; + private RM10AddressingNamespaceType rm10AddressingNamespace; private RMStore store; private RMInInterceptor rmLogicalIn = new RMInInterceptor(); @@ -54,8 +55,6 @@ public class RMFeature extends AbstractF private RMDeliveryInterceptor rmDelivery = new RMDeliveryInterceptor(); private RMSoapInterceptor rmCodec = new RMSoapInterceptor(); private RMCaptureInInterceptor rmCaptureIn = new RMCaptureInInterceptor(); - private String rmNamespace = RM10Constants.NAMESPACE_URI; - private String rm10AddressingNamespace = Names200408.WSA_NAMESPACE_NAME; public void setDeliveryAssurance(DeliveryAssuranceType da) { deliveryAssurance = da; @@ -77,20 +76,12 @@ public class RMFeature extends AbstractF this.store = store; } - public String getRMNamespace() { - return rmNamespace; - } - public void setRMNamespace(String uri) { rmNamespace = uri; } - public String getRM10AddressingNamespace() { - return rm10AddressingNamespace; - } - - public void setRM10AddressingNamespace(String uri) { - rm10AddressingNamespace = uri; + public void setRM10AddressingNamespace(RM10AddressingNamespaceType addrns) { + rm10AddressingNamespace = addrns; } @Override @@ -112,6 +103,12 @@ public class RMFeature extends AbstractF if (null != store) { manager.setStore(store); } + if (null != rmNamespace) { + manager.setRMNamespace(rmNamespace); + } + if (null != rm10AddressingNamespace) { + manager.setRM10AddressingNamespace(rm10AddressingNamespace); + } rmLogicalIn.setBus(bus); rmLogicalOut.setBus(bus); Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java Tue Feb 28 20:53:52 2012 @@ -42,6 +42,7 @@ public class RMPolicyInterceptorProvider static { Collection types = new ArrayList(); types.add(new QName("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", "RMAssertion")); + types.add(new QName("http://docs.oasis-open.org/ws-rx/wsrmp/200702", "RMAssertion")); ASSERTION_TYPES = types; } Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Tue Feb 28 20:53:52 2012 @@ -277,7 +277,7 @@ public class RMSoapInterceptor extends A String wsauri = null; AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, false); if (maps == null) { - wsauri = getManager(message).getRMAddressingNamespace(); + wsauri = getManager(message).getAddressingNamespace(message); } else { wsauri = maps.getNamespaceURI(); } Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java Tue Feb 28 20:53:52 2012 @@ -41,6 +41,8 @@ public class RMFeatureBeanDefinitionPars mapElementToJaxbProperty(element, bean, new QName(RM_NS, "destinationPolicy"), "destinationPolicy"); mapElementToJaxbProperty(element, bean, + new QName(RM_NS, "RM10AddressingNamespace"), "RM10AddressingNamespace"); + mapElementToJaxbProperty(element, bean, new QName("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", "RMAssertion"), "RMAssertion", org.apache.cxf.ws.rmp.v200502.RMAssertion.class); @@ -57,8 +59,6 @@ public class RMFeatureBeanDefinitionPars protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) { if ("store".equals(name)) { setFirstChildAsProperty(e, ctx, bean, name); - } else if ("addressingNamespace".equals(name)) { - bean.addPropertyValue("addressingNamespace", e.getTextContent()); } } Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java Tue Feb 28 20:53:52 2012 @@ -42,6 +42,8 @@ public class RMManagerBeanDefinitionPars mapElementToJaxbProperty(element, bean, new QName(RM_NS, "destinationPolicy"), "destinationPolicy"); mapElementToJaxbProperty(element, bean, + new QName(RM_NS, "RM10AddressingNamespace"), "RM10AddressingNamespace"); + mapElementToJaxbProperty(element, bean, new QName("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", "RMAssertion"), "RMAssertion", org.apache.cxf.ws.rmp.v200502.RMAssertion.class); @@ -66,8 +68,6 @@ public class RMManagerBeanDefinitionPars protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) { if ("store".equals(name)) { setFirstChildAsProperty(e, ctx, bean, name); - } else if ("addressingNamespace".equals(name)) { - bean.addPropertyValue("addressingNamespace", e.getTextContent()); } } Modified: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd (original) +++ cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd Tue Feb 28 20:53:52 2012 @@ -203,26 +203,30 @@ - + + + + + The WS-Addressing namespace to be used for WS-ReliableMessaging 1.0. + For the client, this determines the addressing namespace used when sending + requests to the server. Both client and server will accept either namespace + in incoming messages. + + + + + + + + + + - + + Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java Tue Feb 28 20:53:52 2012 @@ -83,6 +83,7 @@ public class RMManagerConfigurationTest .getMilliseconds().longValue()); assertEquals(10000L, manager.getRMAssertion().getAcknowledgementInterval() .getMilliseconds().longValue()); + assertEquals("http://www.w3.org/2005/08/addressing", manager.getRMAddressingNamespace().getUri()); TestStore store = (TestStore)manager.getStore(); assertEquals("here", store.getLocation()); assertNotNull(manager.getDeliveryAssurance().getInOrder()); Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml Tue Feb 28 20:53:52 2012 @@ -45,7 +45,7 @@ http://www.springframework.org/schema/be - + Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml?rev=1294828&r1=1294827&r2=1294828&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml Tue Feb 28 20:53:52 2012 @@ -44,7 +44,7 @@ http://www.springframework.org/schema/be - +