cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsosno...@apache.org
Subject svn commit: r1492030 - in /cxf/trunk/rt/ws/rm: ./ src/main/java/org/apache/cxf/ws/rm/ src/main/java/org/apache/cxf/ws/rm/feature/ src/main/java/org/apache/cxf/ws/rm/policy/ src/main/resources/schemas/configuration/ src/test/java/org/apache/cxf/ws/rm/
Date Wed, 12 Jun 2013 01:11:09 GMT
Author: dsosnoski
Date: Wed Jun 12 01:11:08 2013
New Revision: 1492030

URL: http://svn.apache.org/r1492030
Log:
CXF-4139 more code cleanup and restructuring to simplify RMConfiguration usage

Removed:
    cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xjb
    cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd
Modified:
    cxf/trunk/rt/ws/rm/pom.xml
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConfiguration.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/feature/RMFeature.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
    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

Modified: cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=1492030&r1=1492029&r2=1492030&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Wed Jun 12 01:11:08 2013
@@ -168,15 +168,6 @@
                                         <extensionArg>-Xdv</extensionArg>
                                     </extensionArgs>
                                  </xsdOption>
-                                 <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xjb</bindingFile>
-                                    <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
-                                    <extension>true</extension>
-                                    <extensionArgs>
-                                        <extensionArg>-Xdv</extensionArg>
-                                    </extensionArgs>
-                                 </xsdOption>
                             </xsdOptions>
                         </configuration>
                         <goals>

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java?rev=1492030&r1=1492029&r2=1492030&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java Wed Jun
12 01:11:08 2013
@@ -37,8 +37,8 @@ import org.apache.cxf.io.CachedOutputStr
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.rm.RMConfiguration.DeliveryAssurance;
 import org.apache.cxf.ws.rm.manager.AcksPolicyType;
-import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.policy.RMPolicyUtilities;
@@ -237,8 +237,9 @@ public class DestinationSequence extends
      */
     boolean applyDeliveryAssurance(long mn, Message message) throws RMException {
         Continuation cont = getContinuation(message);
-        DeliveryAssuranceType da = destination.getManager().getConfiguration().getDeliveryAssurance();
-        boolean canSkip = !da.isSetAtLeastOnce() && !da.isSetExactlyOnce();
+        RMConfiguration config = destination.getManager().getConfiguration();
+        DeliveryAssurance da = config.getDeliveryAssurance();
+        boolean canSkip = da != DeliveryAssurance.AT_LEAST_ONCE && da != DeliveryAssurance.EXACTLY_ONCE;
         boolean robust = false;
         boolean robustDelivering = false;
         if (message != null) {
@@ -253,10 +254,10 @@ public class DestinationSequence extends
             removeDeliveringMessageNumber(mn);
             return true;
         }
-        if (cont != null && da.isSetInOrder() && !cont.isNew()) {
+        if (cont != null && config.isInOrder() && !cont.isNew()) {
             return waitInQueue(mn, canSkip, message, cont);
         }
-        if ((da.isSetExactlyOnce() || da.isSetAtMostOnce()) 
+        if ((da == DeliveryAssurance.EXACTLY_ONCE || da == DeliveryAssurance.AT_MOST_ONCE)

             && (isAcknowledged(mn) 
                 || (robustDelivering && deliveringMessageNumbers.contains(mn))))
{            
             
@@ -271,7 +272,7 @@ public class DestinationSequence extends
         if (robustDelivering) {
             deliveringMessageNumbers.add(mn);
         }
-        if (da.isSetInOrder()) {
+        if (config.isInOrder()) {
             return waitInQueue(mn, canSkip, message, cont);
         }
         return true;

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConfiguration.java?rev=1492030&r1=1492029&r2=1492030&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConfiguration.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConfiguration.java Wed Jun 12
01:11:08 2013
@@ -19,7 +19,6 @@
 
 package org.apache.cxf.ws.rm;
 
-import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType;
 import org.apache.cxf.ws.rm.manager.RM10AddressingNamespaceType;
 
 /**
@@ -27,14 +26,18 @@ import org.apache.cxf.ws.rm.manager.RM10
  * configuration with default values and WS-ReliableMessagingPolicy overrides.
  */
 public class RMConfiguration {
+    
+    public enum DeliveryAssurance {
+        AT_MOST_ONCE, AT_LEAST_ONCE, EXACTLY_ONCE
+    }
     private Long inactivityTimeout;
     private Long acknowledgementInterval;
     private Long baseRetransmissionInterval;
     private boolean exponentialBackoff;
     private boolean sequenceSTRRequired;
     private boolean sequenceTransportSecurityRequired;
-    private boolean exactlyOnce;
-    private DeliveryAssuranceType deliveryAssurance;
+    private boolean inOrder;
+    private DeliveryAssurance deliveryAssurance;
     private String rmNamespace;
     private RM10AddressingNamespaceType rm10AddressingNamespace;
     
@@ -60,32 +63,31 @@ public class RMConfiguration {
         rmNamespace = base.rmNamespace;
         rm10AddressingNamespace = base.rm10AddressingNamespace;
     }
-    
-    /**
-     *  @return Returns the exactlyOnce.
+
+    /** * @return Returns the inOrder.
      */
-    public boolean isExactlyOnce() {
-        return exactlyOnce;
+    public boolean isInOrder() {
+        return inOrder;
     }
 
     /**
-     * @param exactlyOnce The exactlyOnce to set.
+     * @param inOrder The inOrder to set.
      */
-    public void setExactlyOnce(boolean exactlyOnce) {
-        this.exactlyOnce = exactlyOnce;
+    public void setInOrder(boolean inOrder) {
+        this.inOrder = inOrder;
     }
 
     /**  
      * @return Returns the deliveryAssurance.
      */
-    public DeliveryAssuranceType getDeliveryAssurance() {
+    public DeliveryAssurance getDeliveryAssurance() {
         return deliveryAssurance;
     }
 
     /**
      * @param deliveryAssurance The deliveryAssurance to set.
      */
-    public void setDeliveryAssurance(DeliveryAssuranceType deliveryAssurance) {
+    public void setDeliveryAssurance(DeliveryAssurance deliveryAssurance) {
         this.deliveryAssurance = deliveryAssurance;
     }
 

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=1492030&r1=1492029&r2=1492030&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 Wed Jun 12 01:11:08
2013
@@ -59,6 +59,7 @@ import org.apache.cxf.ws.addressing.Endp
 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;
 import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
@@ -205,11 +206,19 @@ public class RMManager {
     }
 
     /**
-     * @param deliveryAssurance The deliveryAssurance to set.
+     * @param dat The deliveryAssurance to set.
      */
-    public void setDeliveryAssurance(DeliveryAssuranceType da) {
-        RMConfiguration cfg = forceConfiguration();
-        cfg.setExactlyOnce(da.isSetExactlyOnce());
+    public void setDeliveryAssurance(DeliveryAssuranceType dat) {
+        RMConfiguration cfg = getConfiguration();
+        cfg.setInOrder(dat.isSetInOrder());
+        DeliveryAssurance da = null;
+        if (dat.isSetExactlyOnce() || (dat.isSetAtLeastOnce() && dat.isSetAtMostOnce()))
{
+            da = DeliveryAssurance.EXACTLY_ONCE;
+        } else if (dat.isSetAtLeastOnce()) {
+            da = DeliveryAssurance.AT_LEAST_ONCE;
+        } else if (dat.isSetAtMostOnce()) {
+            da = DeliveryAssurance.AT_MOST_ONCE;
+        }
         cfg.setDeliveryAssurance(da);
     }
 
@@ -259,7 +268,7 @@ public class RMManager {
      * @param rma The rmAssertion to set.
      */
     public void setRMAssertion(org.apache.cxf.ws.rmp.v200502.RMAssertion rma) {
-        RMConfiguration cfg = forceConfiguration();
+        RMConfiguration cfg = getConfiguration();
         cfg.setExponentialBackoff(rma.getExponentialBackoff() != null);
         org.apache.cxf.ws.rmp.v200502.RMAssertion.InactivityTimeout inactTimeout
             = rma.getInactivityTimeout();
@@ -616,18 +625,9 @@ public class RMManager {
         if (configuration == null) {
             forceConfiguration().setExponentialBackoff(true);
         }
-        DeliveryAssuranceType deliveryAssurance = configuration.getDeliveryAssurance();
-        if (deliveryAssurance == null) {
-            DeliveryAssuranceType da = new DeliveryAssuranceType();
-            da.setAtLeastOnce(new DeliveryAssuranceType.AtLeastOnce());
-            configuration.setDeliveryAssurance(da);
-        } else if (deliveryAssurance.getExactlyOnce() != null) {
-            if (deliveryAssurance.getAtMostOnce() == null) {
-                deliveryAssurance.setAtMostOnce(new DeliveryAssuranceType.AtMostOnce());
-            }
-            if (deliveryAssurance.getAtLeastOnce() == null) {
-                deliveryAssurance.setAtLeastOnce(new DeliveryAssuranceType.AtLeastOnce());
-            }
+        DeliveryAssurance da = configuration.getDeliveryAssurance();
+        if (da == null) {
+            configuration.setDeliveryAssurance(DeliveryAssurance.AT_LEAST_ONCE);
         }
         if (null == sourcePolicy) {
             setSourcePolicy(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=1492030&r1=1492029&r2=1492030&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 Wed Jun 12
01:11:08 2013
@@ -92,7 +92,7 @@ public class RMFeature extends AbstractF
             manager.setRMAssertion(rmAssertion);
         }
         if (null != deliveryAssurance) {
-            manager.getConfiguration().setDeliveryAssurance(deliveryAssurance);
+            manager.setDeliveryAssurance(deliveryAssurance);
         }
         if (null != sourcePolicy) {
             manager.setSourcePolicy(sourcePolicy);

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java?rev=1492030&r1=1492029&r2=1492030&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java Wed
Jun 12 01:11:08 2013
@@ -29,8 +29,8 @@ import org.apache.cxf.ws.policy.builder.
 import org.apache.cxf.ws.rm.RM10Constants;
 import org.apache.cxf.ws.rm.RM11Constants;
 import org.apache.cxf.ws.rm.RMConfiguration;
+import org.apache.cxf.ws.rm.RMConfiguration.DeliveryAssurance;
 import org.apache.cxf.ws.rm.RMUtils;
-import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType;
 import org.apache.cxf.ws.rm.policy.RM12Assertion.Order;
 import org.apache.cxf.ws.rmp.v200502.RMAssertion;
 
@@ -147,9 +147,7 @@ public final class RMPolicyUtilities {
             }
         } else if (b.getDeliveryAssurance() == null) {
             return false;
-        } else if (a.getDeliveryAssurance().isSetAtLeastOnce() != b.getDeliveryAssurance().isSetAtLeastOnce()
-                || a.getDeliveryAssurance().isSetAtMostOnce() != b.getDeliveryAssurance().isSetAtMostOnce()
-                || a.getDeliveryAssurance().isSetInOrder() != b.getDeliveryAssurance().isSetInOrder())
{
+        } else if (a.getDeliveryAssurance() != b.getDeliveryAssurance()) {
             return false;
         }
         if (a.getRM10AddressingNamespace() == null) {
@@ -165,7 +163,7 @@ public final class RMPolicyUtilities {
         if (!RMUtils.equalStrings(a.getRMNamespace(), b.getRMNamespace())) {
             return false;
         }
-        return a.isExactlyOnce() == b.isExactlyOnce()
+        return a.isInOrder() == b.isInOrder()
                && a.isExponentialBackoff() == b.isExponentialBackoff()
                && a.isSequenceSTRRequired() == b.isSequenceSTRRequired()
                && a.isSequenceTransportSecurityRequired() == b.isSequenceTransportSecurityRequired()
@@ -301,29 +299,25 @@ public final class RMPolicyUtilities {
             compatible.setSequenceTransportSecurityRequired(true);
         }
         if (rma.isAssuranceSet()) {
-            DeliveryAssuranceType assurance = compatible.getDeliveryAssurance();
-            if (assurance == null) {
-                assurance = new DeliveryAssuranceType();
-            }
-            if (rma.isInOrder()) {
-                assurance.setInOrder(new DeliveryAssuranceType.InOrder());
-            }
+            compatible.setInOrder(rma.isInOrder());
+            DeliveryAssurance da = null;
             Order order = rma.getOrder();
             if (order != null) {
                 switch (order) {
                 case AtLeastOnce:
-                    assurance.setAtLeastOnce(new DeliveryAssuranceType.AtLeastOnce());
+                    da = DeliveryAssurance.AT_LEAST_ONCE;
                     break;
                 case AtMostOnce:
-                    assurance.setAtMostOnce(new DeliveryAssuranceType.AtMostOnce());
+                    da = DeliveryAssurance.AT_MOST_ONCE;
                     break;
                 case ExactlyOnce:
-                    assurance.setExactlyOnce(new DeliveryAssuranceType.ExactlyOnce());
+                    da = DeliveryAssurance.EXACTLY_ONCE;
                     break;
                 default:
                     // unreachable code, required by checkstyle
                     break;
                 }
+                compatible.setDeliveryAssurance(da);
             }
         }
         return compatible;
@@ -341,19 +335,19 @@ public final class RMPolicyUtilities {
             || (rma.isSequenceTransportSecurity() && !cfg.isSequenceTransportSecurityRequired()))
{
             return false;
         }
-        DeliveryAssuranceType assurance = cfg.getDeliveryAssurance();
-        if (rma.isInOrder() && (assurance == null || assurance.getInOrder() == null))
{
+        if (rma.isInOrder() != cfg.isInOrder()) {
             return false;
         }
         Order order = rma.getOrder();
+        DeliveryAssurance da = cfg.getDeliveryAssurance();
         if (order != null) {
             switch (order) {
             case AtLeastOnce:
-                return assurance.isSetAtLeastOnce();
+                return da == DeliveryAssurance.AT_LEAST_ONCE;
             case AtMostOnce:
-                return assurance.isSetAtMostOnce();
+                return da == DeliveryAssurance.AT_MOST_ONCE;
             case ExactlyOnce:
-                return assurance.isSetExactlyOnce();
+                return da == DeliveryAssurance.EXACTLY_ONCE;
             default:
                 // unreachable code, required by checkstyle
                 break;

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java?rev=1492030&r1=1492029&r2=1492030&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java Wed
Jun 12 01:11:08 2013
@@ -29,8 +29,8 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.Names;
+import org.apache.cxf.ws.rm.RMConfiguration.DeliveryAssurance;
 import org.apache.cxf.ws.rm.manager.AcksPolicyType;
-import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType;
 import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -467,9 +467,7 @@ public class DestinationSequenceTest ext
         List<AcknowledgementRange> ranges = new ArrayList<AcknowledgementRange>();
         AcknowledgementRange r = control.createMock(AcknowledgementRange.class);
         EasyMock.expect(ack.getAcknowledgementRange()).andReturn(ranges);
-        DeliveryAssuranceType assure = new DeliveryAssuranceType();
-        assure.setAtMostOnce(new DeliveryAssuranceType.AtMostOnce());
-        config.setDeliveryAssurance(assure);
+        config.setDeliveryAssurance(DeliveryAssurance.AT_MOST_ONCE);
         
         control.replay();        
         DestinationSequence ds = new DestinationSequence(id, ref, 0, ack, ProtocolVariation.RM10WSA200408);
@@ -504,9 +502,7 @@ public class DestinationSequenceTest ext
             messages[i] = setUpMessage(Integer.toString(i + 1));                        
                  
         }
         
-        DeliveryAssuranceType assure = new DeliveryAssuranceType();
-        assure.setAtLeastOnce(new DeliveryAssuranceType.AtLeastOnce());
-        config.setDeliveryAssurance(assure);
+        config.setDeliveryAssurance(DeliveryAssurance.AT_LEAST_ONCE);
         
         SequenceAcknowledgement ack = factory.createSequenceAcknowledgement();
         List<AcknowledgementRange> ranges = new ArrayList<AcknowledgementRange>();

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=1492030&r1=1492029&r2=1492030&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
Wed Jun 12 01:11:08 2013
@@ -24,7 +24,7 @@ import java.util.Collection;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.ws.rm.manager.RetryPolicyType;
+import org.apache.cxf.ws.rm.RMConfiguration.DeliveryAssurance;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -60,11 +60,9 @@ public class RMManagerConfigurationTest 
         bus = factory.createBus("org/apache/cxf/ws/rm/exactly-once.xml", false);
         RMManager manager = bus.getExtension(RMManager.class);
         RMConfiguration cfg = manager.getConfiguration();
-        assertNotNull(cfg.getDeliveryAssurance().getAtLeastOnce());
-        assertTrue(cfg.getDeliveryAssurance().isSetAtLeastOnce());
-        assertNotNull(cfg.getDeliveryAssurance().getAtMostOnce());
-        assertTrue(cfg.getDeliveryAssurance().isSetAtMostOnce());
-        assertTrue(cfg.isExactlyOnce());
+        DeliveryAssurance da = cfg.getDeliveryAssurance();
+        assertEquals(da, DeliveryAssurance.EXACTLY_ONCE);
+        assertFalse(cfg.isInOrder());
     }
     
     @Test
@@ -73,11 +71,6 @@ public class RMManagerConfigurationTest 
         bus = factory.createBus("org/apache/cxf/ws/rm/feature.xml");
         RMManager manager = bus.getExtension(RMManager.class);
         verifyManager(manager);
-
-        // verify additional properties not verified by verifyManager.
-        RetryPolicyType rmrp = manager.getSourcePolicy().getRetryPolicy();
-        assertNotNull(rmrp);
-        assertEquals(3, rmrp.getMaxRetries());
     }
     
     private void verifyManager(RMManager manager) {
@@ -91,7 +84,7 @@ public class RMManagerConfigurationTest 
             manager.getConfiguration().getRM10AddressingNamespace().getUri());
         TestStore store = (TestStore)manager.getStore();
         assertEquals("here", store.getLocation());     
-        assertNotNull(manager.getConfiguration().getDeliveryAssurance().getInOrder());
+        assertTrue(manager.getConfiguration().isInOrder());
     }
 
     static class TestStore implements RMStore {

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=1492030&r1=1492029&r2=1492030&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 Wed Jun 12 01:11:08
2013
@@ -41,7 +41,6 @@ http://www.springframework.org/schema/be
                 </wsrm-mgr:deliveryAssurance>
                 <wsrm-mgr:sourcePolicy>
                     <wsrm-mgr:sequenceTerminationPolicy terminateOnShutdown="true"/>
                   
-                    <wsrm-mgr:retryPolicy maxRetries="3" />                    
                 </wsrm-mgr:sourcePolicy>
                 <wsrm-mgr:destinationPolicy>
                     <wsrm-mgr:acksPolicy ImmediaAcksTimeout="2000" intraMessageThreshold="0"/>
                   



Mime
View raw message