Author: ay
Date: Wed Jun 5 12:30:53 2013
New Revision: 1489835
URL: http://svn.apache.org/r1489835
Log:
Merged revisions 1489818 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1489818 | ay | 2013-06-05 13:34:37 +0200 (Wed, 05 Jun 2013) | 1 line
add a beans example for ws-rm maxRetry
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml
Propchange: cxf/branches/2.7.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java?rev=1489835&r1=1489834&r2=1489835&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
Wed Jun 5 12:30:53 2013
@@ -24,6 +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.persistence.RMMessage;
import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -72,6 +73,11 @@ 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) {
Modified:
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml?rev=1489835&r1=1489834&r2=1489835&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml
Wed Jun 5 12:30:53 2013
@@ -41,6 +41,7 @@ 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"/>
