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/10/16 21:14:46 UTC
svn commit: r1532864 [2/2] - in /cxf/trunk:
core/src/main/java/org/apache/cxf/policy/
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/
rt/transports/http/src/main/java/org/apache/cxf/transport/http/
rt/ws/policy/src/main/java/org/apache/cxf/ws/...
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java Wed Oct 16 19:14:45 2013
@@ -34,6 +34,7 @@ import org.apache.cxf.bus.extension.Exte
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingMessageInfo;
@@ -52,6 +53,7 @@ import org.apache.neethi.PolicyReference
import org.apache.neethi.PolicyRegistry;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -63,6 +65,7 @@ public class PolicyEngineTest extends As
private IMocksControl control;
private PolicyEngineImpl engine;
+ private Message msg = new MessageImpl();
@Before
public void setUp() {
@@ -121,11 +124,11 @@ public class PolicyEngineTest extends As
AssertingConduit conduit = control.createMock(AssertingConduit.class);
EffectivePolicyImpl epi = control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialise(ei, boi, engine, conduit, true, true);
+ epi.initialise(ei, boi, engine, conduit, true, true, msg);
EasyMock.expectLastCall();
control.replay();
- assertSame(epi, engine.getEffectiveClientRequestPolicy(ei, boi, conduit));
- assertSame(epi, engine.getEffectiveClientRequestPolicy(ei, boi, conduit));
+ assertSame(epi, engine.getEffectiveClientRequestPolicy(ei, boi, conduit, msg));
+ assertSame(epi, engine.getEffectiveClientRequestPolicy(ei, boi, conduit, msg));
control.verify();
}
@@ -138,7 +141,7 @@ public class PolicyEngineTest extends As
control.replay();
engine.setEffectiveClientRequestPolicy(ei, boi, effectivePolicy);
assertSame(effectivePolicy,
- engine.getEffectiveClientRequestPolicy(ei, boi, (Conduit)null));
+ engine.getEffectiveClientRequestPolicy(ei, boi, (Conduit)null, msg));
control.verify();
}
@@ -156,8 +159,8 @@ public class PolicyEngineTest extends As
epi.initialise(ei, boi, engine, destination, false, false, null);
EasyMock.expectLastCall();
control.replay();
- assertSame(epi, engine.getEffectiveServerResponsePolicy(ei, boi, destination, null));
- assertSame(epi, engine.getEffectiveServerResponsePolicy(ei, boi, destination, null));
+ assertSame(epi, engine.getEffectiveServerResponsePolicy(ei, boi, destination, null, msg));
+ assertSame(epi, engine.getEffectiveServerResponsePolicy(ei, boi, destination, null, msg));
control.verify();
}
@@ -170,7 +173,7 @@ public class PolicyEngineTest extends As
control.replay();
engine.setEffectiveServerResponsePolicy(ei, boi, effectivePolicy);
assertSame(effectivePolicy,
- engine.getEffectiveServerResponsePolicy(ei, boi, (Destination)null, null));
+ engine.getEffectiveServerResponsePolicy(ei, boi, (Destination)null, null, msg));
control.verify();
}
@@ -185,11 +188,11 @@ public class PolicyEngineTest extends As
AssertingDestination destination = control.createMock(AssertingDestination.class);
EffectivePolicyImpl epi = control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialise(ei, null, bfi, engine, destination);
+ epi.initialise(ei, null, bfi, engine, destination, msg);
EasyMock.expectLastCall();
control.replay();
- assertSame(epi, engine.getEffectiveServerFaultPolicy(ei, null, bfi, destination));
- assertSame(epi, engine.getEffectiveServerFaultPolicy(ei, null, bfi, destination));
+ assertSame(epi, engine.getEffectiveServerFaultPolicy(ei, null, bfi, destination, msg));
+ assertSame(epi, engine.getEffectiveServerFaultPolicy(ei, null, bfi, destination, msg));
control.verify();
}
@@ -200,7 +203,7 @@ public class PolicyEngineTest extends As
BindingFaultInfo bfi = new BindingFaultInfo(null, null);
EffectivePolicy epi = control.createMock(EffectivePolicy.class);
engine.setEffectiveServerFaultPolicy(ei, bfi, epi);
- assertSame(epi, engine.getEffectiveServerFaultPolicy(ei, null, bfi, (Destination)null));
+ assertSame(epi, engine.getEffectiveServerFaultPolicy(ei, null, bfi, (Destination)null, msg));
}
@Test
@@ -213,11 +216,11 @@ public class PolicyEngineTest extends As
BindingOperationInfo boi = createMockBindingOperationInfo();
EffectivePolicyImpl epi = control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialise(ei, boi, engine, false, true);
+ epi.initialise(ei, boi, engine, false, true, msg);
EasyMock.expectLastCall();
control.replay();
- assertSame(epi, engine.getEffectiveServerRequestPolicy(ei, boi));
- assertSame(epi, engine.getEffectiveServerRequestPolicy(ei, boi));
+ assertSame(epi, engine.getEffectiveServerRequestPolicy(ei, boi, msg));
+ assertSame(epi, engine.getEffectiveServerRequestPolicy(ei, boi, msg));
control.verify();
}
@@ -229,7 +232,7 @@ public class PolicyEngineTest extends As
EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
control.replay();
engine.setEffectiveServerRequestPolicy(ei, boi, effectivePolicy);
- assertSame(effectivePolicy, engine.getEffectiveServerRequestPolicy(ei, boi));
+ assertSame(effectivePolicy, engine.getEffectiveServerRequestPolicy(ei, boi, msg));
control.verify();
}
@@ -243,11 +246,11 @@ public class PolicyEngineTest extends As
BindingOperationInfo boi = createMockBindingOperationInfo();
EffectivePolicyImpl epi = control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialise(ei, boi, engine, true, false);
+ epi.initialise(ei, boi, engine, true, false, msg);
EasyMock.expectLastCall();
control.replay();
- assertSame(epi, engine.getEffectiveClientResponsePolicy(ei, boi));
- assertSame(epi, engine.getEffectiveClientResponsePolicy(ei, boi));
+ assertSame(epi, engine.getEffectiveClientResponsePolicy(ei, boi, msg));
+ assertSame(epi, engine.getEffectiveClientResponsePolicy(ei, boi, msg));
control.verify();
}
@@ -259,7 +262,7 @@ public class PolicyEngineTest extends As
EffectivePolicy epi = control.createMock(EffectivePolicy.class);
control.replay();
engine.setEffectiveClientResponsePolicy(ei, boi, epi);
- assertSame(epi, engine.getEffectiveClientResponsePolicy(ei, boi));
+ assertSame(epi, engine.getEffectiveClientResponsePolicy(ei, boi, msg));
control.verify();
}
@@ -273,11 +276,11 @@ public class PolicyEngineTest extends As
BindingFaultInfo bfi = new BindingFaultInfo(null, null);
EffectivePolicyImpl epi = control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialisePolicy(ei, null, bfi, engine);
+ epi.initialisePolicy(ei, null, bfi, engine, msg);
EasyMock.expectLastCall();
control.replay();
- assertSame(epi, engine.getEffectiveClientFaultPolicy(ei, null, bfi));
- assertSame(epi, engine.getEffectiveClientFaultPolicy(ei, null, bfi));
+ assertSame(epi, engine.getEffectiveClientFaultPolicy(ei, null, bfi, msg));
+ assertSame(epi, engine.getEffectiveClientFaultPolicy(ei, null, bfi, msg));
control.verify();
}
@@ -288,54 +291,54 @@ public class PolicyEngineTest extends As
BindingFaultInfo bfi = new BindingFaultInfo(null, null);
EffectivePolicy epi = control.createMock(EffectivePolicy.class);
engine.setEffectiveClientFaultPolicy(ei, bfi, epi);
- assertSame(epi, engine.getEffectiveClientFaultPolicy(ei, null, bfi));
+ assertSame(epi, engine.getEffectiveClientFaultPolicy(ei, null, bfi, msg));
}
@Test
public void testGetEndpointPolicyClientSide() throws Exception {
Method m = PolicyEngineImpl.class.getDeclaredMethod("createEndpointPolicyInfo",
- new Class[] {EndpointInfo.class, boolean.class, Assertor.class});
+ new Class[] {EndpointInfo.class, boolean.class, Assertor.class, Message.class});
engine = EasyMock.createMockBuilder(PolicyEngineImpl.class)
.addMockedMethod(m).createMock(control);
engine.init();
EndpointInfo ei = createMockEndpointInfo();
AssertingConduit conduit = control.createMock(AssertingConduit.class);
EndpointPolicyImpl epi = control.createMock(EndpointPolicyImpl.class);
- EasyMock.expect(engine.createEndpointPolicyInfo(ei, true, conduit)).andReturn(epi);
+ EasyMock.expect(engine.createEndpointPolicyInfo(ei, true, conduit, msg)).andReturn(epi);
control.replay();
- assertSame(epi, engine.getClientEndpointPolicy(ei, conduit));
+ assertSame(epi, engine.getClientEndpointPolicy(ei, conduit, msg));
control.verify();
}
@Test
public void testGetEndpointPolicyServerSide() throws Exception {
Method m = PolicyEngineImpl.class.getDeclaredMethod("createEndpointPolicyInfo",
- new Class[] {EndpointInfo.class, boolean.class, Assertor.class});
+ new Class[] {EndpointInfo.class, boolean.class, Assertor.class, Message.class});
engine = EasyMock.createMockBuilder(PolicyEngineImpl.class)
.addMockedMethod(m).createMock(control);
engine.init();
EndpointInfo ei = createMockEndpointInfo();
AssertingDestination destination = control.createMock(AssertingDestination.class);
EndpointPolicyImpl epi = control.createMock(EndpointPolicyImpl.class);
- EasyMock.expect(engine.createEndpointPolicyInfo(ei, false, destination)).andReturn(epi);
+ EasyMock.expect(engine.createEndpointPolicyInfo(ei, false, destination, msg)).andReturn(epi);
control.replay();
- assertSame(epi, engine.getServerEndpointPolicy(ei, destination));
+ assertSame(epi, engine.getServerEndpointPolicy(ei, destination, msg));
control.verify();
}
@Test
public void testCreateEndpointPolicyInfo() throws Exception {
Method m1 = PolicyEngineImpl.class.getDeclaredMethod("createEndpointPolicyInfo",
- new Class[] {EndpointInfo.class, boolean.class, Assertor.class});
+ new Class[] {EndpointInfo.class, boolean.class, Assertor.class, Message.class});
engine = EasyMock.createMockBuilder(PolicyEngineImpl.class)
.addMockedMethod(m1).createMock(control);
engine.init();
EndpointInfo ei = createMockEndpointInfo();
Assertor assertor = control.createMock(Assertor.class);
EndpointPolicyImpl epi = control.createMock(EndpointPolicyImpl.class);
- EasyMock.expect(engine.createEndpointPolicyInfo(ei, false, assertor)).andReturn(epi);
+ EasyMock.expect(engine.createEndpointPolicyInfo(ei, false, assertor, msg)).andReturn(epi);
control.replay();
- assertSame(epi, engine.createEndpointPolicyInfo(ei, false, assertor));
+ assertSame(epi, engine.createEndpointPolicyInfo(ei, false, assertor, msg));
control.verify();
}
@@ -352,8 +355,8 @@ public class PolicyEngineTest extends As
engine.setServerEndpointPolicy(ei, epi);
engine.setClientEndpointPolicy(ei, epi);
- assertSame(epi, engine.getClientEndpointPolicy(ei, (Conduit)null));
- assertSame(epi, engine.getServerEndpointPolicy(ei, (Destination)null));
+ assertSame(epi, engine.getClientEndpointPolicy(ei, (Conduit)null, msg));
+ assertSame(epi, engine.getServerEndpointPolicy(ei, (Destination)null, msg));
control.reset();
ei.setService(si);
@@ -363,7 +366,7 @@ public class PolicyEngineTest extends As
epi.getPolicy();
EasyMock.expectLastCall().andReturn(p).times(2);
control.replay();
- assertSame(epi, engine.getServerEndpointPolicy(ei, (Destination)null));
+ assertSame(epi, engine.getServerEndpointPolicy(ei, (Destination)null, msg));
}
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java Wed Oct 16 19:14:45 2013
@@ -89,7 +89,7 @@ public class PolicyInterceptorsTest exte
control.reset();
setupMessage(true, true, true, true, true, true);
EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
- EasyMock.expect(pe.getEffectiveClientRequestPolicy(ei, boi, conduit))
+ EasyMock.expect(pe.getEffectiveClientRequestPolicy(ei, boi, conduit, message))
.andReturn(effectivePolicy);
List<Interceptor<? extends Message>> li = createMockInterceptorList();
EasyMock.expect(effectivePolicy.getInterceptors())
@@ -116,7 +116,7 @@ public class PolicyInterceptorsTest exte
control.reset();
setupMessage(true, true, true, true, true, true);
EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
- EasyMock.expect(pe.getEffectiveClientResponsePolicy(ei, boi)).andReturn(effectivePolicy);
+ EasyMock.expect(pe.getEffectiveClientResponsePolicy(ei, boi, message)).andReturn(effectivePolicy);
EasyMock.expect(effectivePolicy.getPolicy()).andReturn(new Policy()).times(2);
Interceptor<? extends Message> i = control.createMock(Interceptor.class);
List<Interceptor<? extends Message>> lst = new ArrayList<Interceptor<? extends Message>>();
@@ -143,7 +143,7 @@ public class PolicyInterceptorsTest exte
control.reset();
setupMessage(true, true, false, false, true, true);
EndpointPolicy endpointPolicy = control.createMock(EndpointPolicy.class);
- EasyMock.expect(pe.getClientEndpointPolicy(ei, conduit)).andReturn(endpointPolicy);
+ EasyMock.expect(pe.getClientEndpointPolicy(ei, conduit, message)).andReturn(endpointPolicy);
List<Interceptor<? extends Message>> li = createMockInterceptorList();
EasyMock.expect(endpointPolicy.getFaultInterceptors())
.andReturn(li);
@@ -168,7 +168,7 @@ public class PolicyInterceptorsTest exte
control.reset();
setupMessage(false, false, false, false, true, true);
EndpointPolicy endpointPolicy = control.createMock(EndpointPolicyImpl.class);
- EasyMock.expect(pe.getServerEndpointPolicy(ei, destination)).andReturn(endpointPolicy);
+ EasyMock.expect(pe.getServerEndpointPolicy(ei, destination, message)).andReturn(endpointPolicy);
List<Interceptor<? extends Message>> li = createMockInterceptorList();
EasyMock.expect(endpointPolicy.getInterceptors())
.andReturn(li);
@@ -193,7 +193,7 @@ public class PolicyInterceptorsTest exte
control.reset();
setupMessage(false, false, true, true, true, true);
EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
- EasyMock.expect(pe.getEffectiveServerResponsePolicy(ei, boi, destination, null))
+ EasyMock.expect(pe.getEffectiveServerResponsePolicy(ei, boi, destination, null, message))
.andReturn(effectivePolicy);
List<Interceptor<? extends Message>> li = createMockInterceptorList();
EasyMock.expect(effectivePolicy.getInterceptors())
@@ -237,7 +237,7 @@ public class PolicyInterceptorsTest exte
BindingFaultInfo bfi = control.createMock(BindingFaultInfo.class);
EasyMock.expect(interceptor.getBindingFaultInfo(message, ex, boi)).andReturn(bfi);
EffectivePolicy effectivePolicy = control.createMock(EffectivePolicyImpl.class);
- EasyMock.expect(pe.getEffectiveServerFaultPolicy(ei, boi, bfi, destination))
+ EasyMock.expect(pe.getEffectiveServerFaultPolicy(ei, boi, bfi, destination, message))
.andReturn(effectivePolicy);
List<Interceptor<? extends Message>> li = createMockInterceptorList();
EasyMock.expect(effectivePolicy.getInterceptors())
@@ -463,7 +463,7 @@ public class PolicyInterceptorsTest exte
EasyMock.expect(message.getContextualProperty(PolicyConstants.POLICY_OVERRIDE))
.andReturn(policyOverride);
AlternativeSelector selector = control.createMock(AlternativeSelector.class);
- EasyMock.expect(selector.selectAlternative(policyOverride, pe, null, null)).andReturn(assertions);
+ EasyMock.expect(selector.selectAlternative(policyOverride, pe, null, null, message)).andReturn(assertions);
EasyMock.expect(pe.getAlternativeSelector()).andReturn(selector);
EasyMock.expect(pe.getBus()).andReturn(bus).anyTimes();
PolicyInterceptorProviderRegistry reg = control
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java Wed Oct 16 19:14:45 2013
@@ -107,7 +107,7 @@ public class PolicyVerificationInFaultIn
interceptor.getTransportAssertions(message);
EasyMock.expectLastCall();
EffectivePolicyImpl effectivePolicy = control.createMock(EffectivePolicyImpl.class);
- EasyMock.expect(engine.getEffectiveClientFaultPolicy(ei, boi, bfi)).andReturn(effectivePolicy);
+ EasyMock.expect(engine.getEffectiveClientFaultPolicy(ei, boi, bfi, message)).andReturn(effectivePolicy);
Policy policy = control.createMock(Policy.class);
EasyMock.expect(effectivePolicy.getPolicy()).andReturn(policy);
aim.checkEffectivePolicy(policy);
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java Wed Oct 16 19:14:45 2013
@@ -99,7 +99,7 @@ public class PolicyVerificationInInterce
EasyMock.expectLastCall();
EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.TRUE);
- EasyMock.expect(engine.getEffectiveClientResponsePolicy(ei, boi)).andReturn(effectivePolicy);
+ EasyMock.expect(engine.getEffectiveClientResponsePolicy(ei, boi, message)).andReturn(effectivePolicy);
Policy policy = control.createMock(Policy.class);
EasyMock.expect(effectivePolicy.getPolicy()).andReturn(policy);
aim.checkEffectivePolicy(policy);
@@ -115,7 +115,7 @@ public class PolicyVerificationInInterce
EasyMock.expectLastCall();
effectivePolicy = control.createMock(EffectivePolicy.class);
EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.FALSE);
- EasyMock.expect(engine.getEffectiveServerRequestPolicy(ei, boi)).andReturn(effectivePolicy);
+ EasyMock.expect(engine.getEffectiveServerRequestPolicy(ei, boi, message)).andReturn(effectivePolicy);
policy = control.createMock(Policy.class);
EasyMock.expect(effectivePolicy.getPolicy()).andReturn(policy);
aim.checkEffectivePolicy(policy);
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java Wed Oct 16 19:14:45 2013
@@ -22,6 +22,8 @@ package org.apache.cxf.ws.policy.selecto
import java.util.Collection;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.ws.policy.AlternativeSelector;
import org.apache.cxf.ws.policy.Assertor;
import org.apache.cxf.ws.policy.PolicyAssertion;
@@ -33,6 +35,7 @@ import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -69,13 +72,14 @@ public class FirstAlternativeSelectorTes
EasyMock.expect(engine.supportsAlternative(firstAlternative, assertor)).andReturn(false);
control.replay();
- assertNull(selector.selectAlternative(policy, engine, assertor, null));
+ Message m = new MessageImpl();
+ assertNull(selector.selectAlternative(policy, engine, assertor, null, m));
control.verify();
control.reset();
EasyMock.expect(engine.supportsAlternative(firstAlternative, assertor)).andReturn(true);
control.replay();
- Collection<Assertion> chosen = selector.selectAlternative(policy, engine, assertor, null);
+ Collection<Assertion> chosen = selector.selectAlternative(policy, engine, assertor, null, m);
assertSame(1, chosen.size());
assertSame(chosen.size(), firstAlternative.size());
assertSame(chosen.iterator().next(), firstAlternative.iterator().next());
@@ -91,7 +95,7 @@ public class FirstAlternativeSelectorTes
EasyMock.expect(engine.supportsAlternative(secondAlternative, assertor)).andReturn(true);
control.replay();
- chosen = selector.selectAlternative(policy, engine, assertor, null);
+ chosen = selector.selectAlternative(policy, engine, assertor, null, m);
assertSame(1, chosen.size());
assertSame(chosen.size(), secondAlternative.size());
assertSame(chosen.iterator().next(), secondAlternative.iterator().next());
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java Wed Oct 16 19:14:45 2013
@@ -22,6 +22,8 @@ package org.apache.cxf.ws.policy.selecto
import java.util.Collection;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.ws.policy.AlternativeSelector;
import org.apache.cxf.ws.policy.Assertor;
import org.apache.cxf.ws.policy.PolicyAssertion;
@@ -33,6 +35,7 @@ import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -52,6 +55,7 @@ public class MinimalMaximalAlternativeSe
@Test
public void testChooseMinAlternative() {
+ Message m = new MessageImpl();
AlternativeSelector selector = new MinimalAlternativeSelector();
PolicyEngine engine = control.createMock(PolicyEngine.class);
@@ -75,7 +79,7 @@ public class MinimalMaximalAlternativeSe
control.replay();
Collection<Assertion> choice =
- selector.selectAlternative(policy, engine, assertor, null);
+ selector.selectAlternative(policy, engine, assertor, null, m);
assertEquals(0, choice.size());
control.verify();
}
@@ -104,7 +108,8 @@ public class MinimalMaximalAlternativeSe
EasyMock.expect(engine.supportsAlternative(minAlternative, assertor)).andReturn(true);
control.replay();
- Collection<Assertion> choice = selector.selectAlternative(policy, engine, assertor, null);
+ Message m = new MessageImpl();
+ Collection<Assertion> choice = selector.selectAlternative(policy, engine, assertor, null, m);
assertEquals(1, choice.size());
assertSame(a1, choice.iterator().next());
control.verify();
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java Wed Oct 16 19:14:45 2013
@@ -54,6 +54,7 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.management.jmx.export.runtime.ModelMBeanAssembler;
+import org.apache.cxf.message.Message;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.BindingInfo;
@@ -310,13 +311,14 @@ public class RMEndpoint {
}
void initialise(RMConfiguration config, Conduit c, EndpointReferenceType r,
- org.apache.cxf.transport.Destination d) {
+ org.apache.cxf.transport.Destination d,
+ Message message) {
configuration = config;
conduit = c;
replyTo = r;
createServices();
createEndpoints(d);
- setPolicies();
+ setPolicies(message);
if (manager != null && manager.getBus() != null) {
managedEndpoint = new ManagedRMEndpoint(this);
instrumentationManager = manager.getBus().getExtension(InstrumentationManager.class);
@@ -441,7 +443,7 @@ public class RMEndpoint {
endpoints.put(protocol, endpoint);
}
- void setPolicies() {
+ void setPolicies(Message message) {
// use same WS-policies as for application endpoint
PolicyEngine engine = manager.getBus().getExtension(PolicyEngine.class);
if (null == engine || !engine.isEnabled()) {
@@ -451,8 +453,8 @@ public class RMEndpoint {
for (Endpoint endpoint : endpoints.values()) {
EndpointInfo ei = endpoint.getEndpointInfo();
EndpointPolicy epi = null == conduit
- ? engine.getServerEndpointPolicy(applicationEndpoint.getEndpointInfo(), null)
- : engine.getClientEndpointPolicy(applicationEndpoint.getEndpointInfo(), conduit);
+ ? engine.getServerEndpointPolicy(applicationEndpoint.getEndpointInfo(), null, message)
+ : engine.getClientEndpointPolicy(applicationEndpoint.getEndpointInfo(), conduit, message);
if (conduit != null) {
engine.setClientEndpointPolicy(ei, epi);
@@ -460,9 +462,9 @@ public class RMEndpoint {
engine.setServerEndpointPolicy(ei, epi);
}
EffectivePolicyImpl effectiveOutbound = new EffectivePolicyImpl();
- effectiveOutbound.initialise(epi, engine, false, false);
+ effectiveOutbound.initialise(epi, engine, false, false, message);
EffectivePolicyImpl effectiveInbound = new EffectivePolicyImpl();
- effectiveInbound.initialise(epi, engine, true, false);
+ effectiveInbound.initialise(epi, engine, true, false, message);
BindingInfo bi = ei.getBinding();
Collection<BindingOperationInfo> bois = bi.getOperations();
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=1532864&r1=1532863&r2=1532864&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 Oct 16 19:14:45 2013
@@ -377,7 +377,7 @@ public class RMManager {
.getProperty(MAPAggregator.DECOUPLED_DESTINATION,
org.apache.cxf.transport.Destination.class);
config = RMPolicyUtilities.getRMConfiguration(config, message);
- rme.initialise(config, message.getExchange().getConduit(message), replyTo, dest);
+ rme.initialise(config, message.getExchange().getConduit(message), replyTo, dest, message);
reliableEndpoints.put(endpoint, rme);
LOG.fine("Created new RMEndpoint.");
}
@@ -533,7 +533,7 @@ public class RMManager {
LOG.log(Level.FINE, "Recovering {0} endpoint with id: {1}",
new Object[] {null == conduit ? "client" : "server", id});
RMEndpoint rme = createReliableEndpoint(endpoint);
- rme.initialise(getConfiguration(), conduit, null, null);
+ rme.initialise(getConfiguration(), conduit, null, null, null);
reliableEndpoints.put(endpoint, rme);
for (SourceSequence ss : sss) {
recoverSourceSequence(endpoint, conduit, rme.getSource(), ss);
Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java Wed Oct 16 19:14:45 2013
@@ -33,6 +33,8 @@ import org.apache.cxf.binding.soap.model
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.EndpointImpl;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
@@ -130,10 +132,11 @@ public class RMEndpointTest extends Asse
@Test
public void testInitialise() throws NoSuchMethodException {
+ Message m = new MessageImpl();
Method m1 = RMEndpoint.class.getDeclaredMethod("createServices", new Class[] {});
Method m2 = RMEndpoint.class
.getDeclaredMethod("createEndpoints", new Class[] {org.apache.cxf.transport.Destination.class});
- Method m3 = RMEndpoint.class.getDeclaredMethod("setPolicies", new Class[] {});
+ Method m3 = RMEndpoint.class.getDeclaredMethod("setPolicies", new Class[] {Message.class});
rme = EasyMock.createMockBuilder(RMEndpoint.class)
.addMockedMethods(m1, m2 , m3).createMock(control);
@@ -141,12 +144,12 @@ public class RMEndpointTest extends Asse
EasyMock.expectLastCall();
rme.createEndpoints(null);
EasyMock.expectLastCall();
- rme.setPolicies();
+ rme.setPolicies(m);
EasyMock.expectLastCall();
Conduit c = control.createMock(Conduit.class);
EndpointReferenceType epr = control.createMock(EndpointReferenceType.class);
control.replay();
- rme.initialise(new RMConfiguration(), c, epr, null);
+ rme.initialise(new RMConfiguration(), c, epr, null, m);
assertSame(c, rme.getConduit());
assertSame(epr, rme.getReplyTo());
}
@@ -247,22 +250,24 @@ public class RMEndpointTest extends Asse
@Test
public void testSetPoliciesNoEngine() {
+ Message m = new MessageImpl();
Bus bus = control.createMock(Bus.class);
EasyMock.expect(manager.getBus()).andReturn(bus);
EasyMock.expect(bus.getExtension(PolicyEngine.class)).andReturn(null);
control.replay();
- rme.setPolicies();
+ rme.setPolicies(m);
}
@Test
public void testSetPoliciesEngineDisabled() {
+ Message m = new MessageImpl();
Bus bus = control.createMock(Bus.class);
EasyMock.expect(manager.getBus()).andReturn(bus);
PolicyEngineImpl pe = control.createMock(PolicyEngineImpl.class);
EasyMock.expect(bus.getExtension(PolicyEngine.class)).andReturn(pe);
EasyMock.expect(pe.isEnabled()).andReturn(false);
control.replay();
- rme.setPolicies();
+ rme.setPolicies(m);
}
@Test
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=1532864&r1=1532863&r2=1532864&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 Wed Oct 16 19:14:45 2013
@@ -269,7 +269,7 @@ public class RMManagerTest extends Asser
EndpointReferenceType replyTo = RMUtils.createAnonymousReference();
EasyMock.expect(maps.getReplyTo()).andReturn(replyTo).anyTimes();
EasyMock.expect(exchange.getConduit(message)).andReturn(null).anyTimes();
- rme.initialise(manager.getConfiguration(), null, replyTo, null);
+ rme.initialise(manager.getConfiguration(), null, replyTo, null, message);
EasyMock.expectLastCall();
control.replay();
@@ -309,7 +309,7 @@ public class RMManagerTest extends Asser
EasyMock.expect(exchange.getDestination()).andReturn(null);
Conduit conduit = control.createMock(Conduit.class);
EasyMock.expect(exchange.getConduit(message)).andReturn(conduit);
- rme.initialise(manager.getConfiguration(), conduit, null, null);
+ rme.initialise(manager.getConfiguration(), conduit, null, null, message);
EasyMock.expectLastCall();
control.replay();
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java Wed Oct 16 19:14:45 2013
@@ -226,7 +226,7 @@ final class NegotiationUtils {
endpoint.getEndpointInfo().setProperty(TokenStore.class.getName(), store);
message.getExchange().put(TokenStore.class.getName(), store);
- EndpointPolicy ep = pe.getServerEndpointPolicy(endpoint.getEndpointInfo(), destination);
+ EndpointPolicy ep = pe.getServerEndpointPolicy(endpoint.getEndpointInfo(), destination, message);
List<Interceptor<? extends Message>> interceptors = ep.getInterceptors();
for (Interceptor<? extends Message> i : interceptors) {
message.getInterceptorChain().add(i);
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java Wed Oct 16 19:14:45 2013
@@ -71,6 +71,7 @@ import org.apache.cxf.interceptor.Interc
import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
@@ -604,8 +605,10 @@ public abstract class AbstractSTSClient
|| (wsamAction != null && wsamAction.endsWith(suffix))) {
PolicyEngine pe = bus.getExtension(PolicyEngine.class);
Conduit conduit = client.getConduit();
- EffectivePolicy effectivePolicy = pe.getEffectiveClientRequestPolicy(client.getEndpoint()
- .getEndpointInfo(), boi, conduit);
+ EffectivePolicy effectivePolicy
+ = pe.getEffectiveClientRequestPolicy(client.getEndpoint().getEndpointInfo(),
+ boi, conduit,
+ PhaseInterceptorChain.getCurrentMessage());
setPolicyInternal(effectivePolicy.getPolicy());
return boi;
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java Wed Oct 16 19:14:45 2013
@@ -66,6 +66,7 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
@@ -510,7 +511,7 @@ public class SimpleBatchSTSClient implem
PolicyEngine pe = bus.getExtension(PolicyEngine.class);
Conduit conduit = client.getConduit();
EffectivePolicy effectivePolicy = pe.getEffectiveClientRequestPolicy(client.getEndpoint()
- .getEndpointInfo(), boi, conduit);
+ .getEndpointInfo(), boi, conduit, PhaseInterceptorChain.getCurrentMessage());
setPolicyInternal(effectivePolicy.getPolicy());
return boi;
}
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Wed Oct 16 19:14:45 2013
@@ -19,6 +19,8 @@
package org.apache.cxf.systest.ws.rm;
+import java.io.Closeable;
+import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.util.HashMap;
@@ -1567,7 +1569,7 @@ public class SequenceTest extends Abstra
LOG.fine("Using decoupled endpoint: " + cp.getDecoupledEndpoint());
}
- private void stopClient() {
+ private void stopClient() throws IOException {
if (null != greeterBus) {
//ensure we close the decoupled destination of the conduit,
@@ -1575,9 +1577,15 @@ public class SequenceTest extends Abstra
if (greeter != null) {
ClientProxy.getClient(greeter).getConduit().close();
}
+ if (greeter instanceof Closeable) {
+ ((Closeable)greeter).close();
+ }
if (dispatch != null) {
((DispatchImpl<?>)dispatch).getClient().getConduit().close();
}
+ if (dispatch instanceof Closeable) {
+ ((Closeable)dispatch).close();
+ }
greeterBus.shutdown(true);
greeter = null;
dispatch = null;
@@ -1585,8 +1593,9 @@ public class SequenceTest extends Abstra
}
}
- private void stopControl() {
- if (null != control) {
+ private void stopControl() throws IOException {
+ if (null != control) {
+ ((Closeable)control).close();
assertTrue("Failed to stop greeter", control.stopGreeter(null));
controlBus.shutdown(true);
}
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java Wed Oct 16 19:14:45 2013
@@ -60,7 +60,7 @@ public class PolicyLoggingInterceptor ex
LOG.fine("Getting effective server request policy for endpoint " + ei
+ " and binding operation " + boi);
EffectivePolicy ep =
- bus.getExtension(PolicyEngine.class).getEffectiveServerRequestPolicy(ei, boi);
+ bus.getExtension(PolicyEngine.class).getEffectiveServerRequestPolicy(ei, boi, message);
for (Iterator<List<Assertion>> it = ep.getPolicy().getAlternatives(); it.hasNext();) {
Collection<Assertion> as = it.next();
LOG.fine("Checking alternative with " + as.size() + " assertions.");
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTestBase.java?rev=1532864&r1=1532863&r2=1532864&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTestBase.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTestBase.java Wed Oct 16 19:14:45 2013
@@ -84,7 +84,7 @@ public class RMPolicyWsdlTestBase extend
protected List<PolicyAssertion> getAssertions(PolicyEngine pe, org.apache.cxf.endpoint.Server s) {
Policy p1 = pe.getServerEndpointPolicy(
- s.getEndpoint().getEndpointInfo(), null).getPolicy();
+ s.getEndpoint().getEndpointInfo(), null, null).getPolicy();
List<ExactlyOne> pops =
CastUtils.cast(p1.getPolicyComponents(), ExactlyOne.class);
assertEquals("New policy must have 1 top level policy operator", 1, pops.size());