Author: dkulp
Date: Wed Oct 28 13:37:59 2009
New Revision: 830535
URL: http://svn.apache.org/viewvc?rev=830535&view=rev
Log:
Merged revisions 830532 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r830532 | dkulp | 2009-10-28 09:33:12 -0400 (Wed, 28 Oct 2009) | 2 lines
[CXF-2499] Proper support for message level policies.
Patches from Christian Connert applied
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java?rev=830535&r1=830534&r2=830535&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
Wed Oct 28 13:37:59 2009
@@ -82,16 +82,16 @@
BindingOperationInfo boi,
PolicyEngineImpl engine,
Assertor assertor,
- boolean requestor) {
- initialisePolicy(ei, boi, engine, requestor, assertor);
+ boolean requestor, boolean request) {
+ initialisePolicy(ei, boi, engine, requestor, request, assertor);
chooseAlternative(engine, assertor);
initialiseInterceptors(engine, false);
}
void initialise(EndpointInfo ei,
BindingOperationInfo boi,
PolicyEngineImpl engine,
- boolean requestor) {
- Assertor assertor = initialisePolicy(ei, boi, engine, requestor, null);
+ boolean requestor, boolean request) {
+ Assertor assertor = initialisePolicy(ei, boi, engine, requestor,
request, null);
chooseAlternative(engine, assertor);
initialiseInterceptors(engine, requestor);
}
@@ -108,13 +108,14 @@
Assertor initialisePolicy(EndpointInfo ei,
BindingOperationInfo boi,
PolicyEngineImpl engine,
- boolean requestor,
+ boolean requestor, boolean request,
Assertor assertor) {
if (boi.isUnwrapped()) {
boi = boi.getUnwrappedOperation();
}
- BindingMessageInfo bmi = requestor ? boi.getInput() : boi.getOutput();
+
+ BindingMessageInfo bmi = request ? boi.getInput() : boi.getOutput();
EndpointPolicy ep;
if (requestor) {
ep = engine.getClientEndpointPolicy(ei, (Conduit)assertor);
Modified:
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java?rev=830535&r1=830534&r2=830535&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
Wed Oct 28 13:37:59 2009
@@ -152,7 +152,7 @@
if (c instanceof Assertor) {
assertor = (Assertor)c;
}
- epi.initialise(ei, boi, this, assertor, true);
+ epi.initialise(ei, boi, this, assertor, true, true);
boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
effectivePolicy = epi;
}
@@ -174,7 +174,7 @@
if (d instanceof Assertor) {
assertor = (Assertor)d;
}
- epi.initialise(ei, boi, this, assertor, false);
+ epi.initialise(ei, boi, this, assertor, false, false);
boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
effectivePolicy = epi;
}
@@ -242,7 +242,7 @@
EffectivePolicy effectivePolicy =
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_SERVER);
if (null == effectivePolicy) {
EffectivePolicyImpl epi = createOutPolicyInfo();
- epi.initialise(ei, boi, this, false);
+ epi.initialise(ei, boi, this, false, true);
boi.setProperty(POLICY_INFO_REQUEST_SERVER, epi);
effectivePolicy = epi;
}
@@ -258,7 +258,7 @@
EffectivePolicy effectivePolicy =
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_CLIENT);
if (null == effectivePolicy) {
EffectivePolicyImpl epi = createOutPolicyInfo();
- epi.initialise(ei, boi, this, true);
+ epi.initialise(ei, boi, this, true, true);
boi.setProperty(POLICY_INFO_RESPONSE_CLIENT, epi);
effectivePolicy = epi;
}
Modified:
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java?rev=830535&r1=830534&r2=830535&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
Wed Oct 28 13:37:59 2009
@@ -102,6 +102,7 @@
BindingOperationInfo.class,
PolicyEngineImpl.class,
boolean.class,
+ boolean.class,
Assertor.class});
Method m2 =
EffectivePolicyImpl.class.getDeclaredMethod("chooseAlternative",
new Class[] {PolicyEngineImpl.class, Assertor.class});
@@ -115,7 +116,7 @@
Assertor a = control.createMock(Assertor.class);
boolean requestor = true;
- effectivePolicy.initialisePolicy(ei, boi, pe, requestor, a);
+ effectivePolicy.initialisePolicy(ei, boi, pe, requestor, requestor, a);
EasyMock.expectLastCall().andReturn(a);
effectivePolicy.chooseAlternative(pe, a);
EasyMock.expectLastCall();
@@ -123,7 +124,7 @@
EasyMock.expectLastCall();
control.replay();
- effectivePolicy.initialise(ei, boi, pe, a, requestor);
+ effectivePolicy.initialise(ei, boi, pe, a, requestor, requestor);
control.verify();
}
@@ -194,7 +195,7 @@
control.replay();
EffectivePolicyImpl epi = new EffectivePolicyImpl();
- epi.initialisePolicy(ei, boi, engine, requestor, null);
+ epi.initialisePolicy(ei, boi, engine, requestor, requestor, null);
assertSame(merged, epi.getPolicy());
control.verify();
}
Modified:
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java?rev=830535&r1=830534&r2=830535&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
Wed Oct 28 13:37:59 2009
@@ -118,7 +118,7 @@
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);
+ epi.initialise(ei, boi, engine, conduit, true, true);
EasyMock.expectLastCall();
control.replay();
assertSame(epi, engine.getEffectiveClientRequestPolicy(ei, boi,
conduit));
@@ -149,7 +149,7 @@
AssertingDestination destination =
control.createMock(AssertingDestination.class);
EffectivePolicyImpl epi =
control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialise(ei, boi, engine, destination, false);
+ epi.initialise(ei, boi, engine, destination, false, false);
EasyMock.expectLastCall();
control.replay();
assertSame(epi, engine.getEffectiveServerResponsePolicy(ei, boi,
destination));
@@ -207,7 +207,7 @@
BindingOperationInfo boi = createMockBindingOperationInfo();
EffectivePolicyImpl epi =
control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialise(ei, boi, engine, false);
+ epi.initialise(ei, boi, engine, false, true);
EasyMock.expectLastCall();
control.replay();
assertSame(epi, engine.getEffectiveServerRequestPolicy(ei, boi));
@@ -236,7 +236,7 @@
BindingOperationInfo boi = createMockBindingOperationInfo();
EffectivePolicyImpl epi =
control.createMock(EffectivePolicyImpl.class);
EasyMock.expect(engine.createOutPolicyInfo()).andReturn(epi);
- epi.initialise(ei, boi, engine, true);
+ epi.initialise(ei, boi, engine, true, true);
EasyMock.expectLastCall();
control.replay();
assertSame(epi, engine.getEffectiveClientResponsePolicy(ei, boi));
