You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by an...@apache.org on 2007/02/28 11:02:00 UTC
svn commit: r512685 - in /incubator/cxf/trunk/rt/ws:
addr/src/main/java/org/apache/cxf/ws/addressing/
policy/src/main/java/org/apache/cxf/ws/policy/
policy/src/test/java/org/apache/cxf/ws/policy/
Author: andreasmyth
Date: Wed Feb 28 02:01:59 2007
New Revision: 512685
URL: http://svn.apache.org/viewvc?view=rev&rev=512685
Log:
Removed System.out.println left in MAPAggregator.
Suppressed policy verification for partial responses (server outbound and client inbound).
Modified:
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?view=diff&rev=512685&r1=512684&r2=512685
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Wed Feb 28 02:01:59 2007
@@ -197,7 +197,6 @@
for (AssertionInfo ai : ais) {
ai.setAsserted(true);
- System.out.println("Asserted Addressing assertion: " + ai.getAssertion());
}
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java?view=diff&rev=512685&r1=512684&r2=512685
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java Wed Feb 28 02:01:59 2007
@@ -80,6 +80,7 @@
OutPolicyInfo opi = pe.getClientFaultPolicyInfo(e, bfi);
opi.checkEffectivePolicy(aim);
+ LOG.fine("Verified policies for inbound message.");
}
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java?view=diff&rev=512685&r1=512684&r2=512685
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java Wed Feb 28 02:01:59 2007
@@ -73,7 +73,7 @@
}
if (PolicyUtils.isPartialResponse(message)) {
- LOG.fine("This is a partial response - policies are not verified.");
+ LOG.fine("Not verifying policies on inbound partial response.");
return;
}
@@ -85,6 +85,7 @@
}
opi.checkEffectivePolicy(aim);
+ LOG.fine("Verified policies for inbound message.");
}
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java?view=diff&rev=512685&r1=512684&r2=512685
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java Wed Feb 28 02:01:59 2007
@@ -51,6 +51,12 @@
* @param message
*/
public void handleMessage(Message message) throws Fault {
+
+ if (PolicyUtils.isPartialResponse(message)) {
+ LOG.fine("Not verifying policies on outbound partial response.");
+ return;
+ }
+
AssertionInfoMap aim = message.get(AssertionInfoMap.class);
if (null == aim) {
return;
@@ -63,7 +69,7 @@
}
}
}
- LOG.fine("At least one alternative of the policy for the output message is supported.");
+ LOG.fine("Verified policies for outbound message.");
}
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java?view=diff&rev=512685&r1=512684&r2=512685
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java Wed Feb 28 02:01:59 2007
@@ -295,14 +295,6 @@
Boolean setupEndpoint,
Boolean setupEngine) {
- /*
- System.out.println("setupMessage, setupRequestor: " + setupRequestor
- + ", isClient: " + isClient
- + ", usesOperationInfo: " + usesOperationInfo
- + ", setupOperation: " + setupOperation
- + ", setupEndpoint: " + setupEndpoint
- + ", setupEngine: " + setupEngine);
- */
message = control.createMock(Message.class);
EasyMock.expect(message.get(Message.REQUESTOR_ROLE))
.andReturn(setupRequestor ? Boolean.TRUE : Boolean.FALSE);
Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java?view=diff&rev=512685&r1=512684&r2=512685
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java Wed Feb 28 02:01:59 2007
@@ -46,6 +46,13 @@
PolicyVerificationOutInterceptor interceptor = new PolicyVerificationOutInterceptor();
Message message = control.createMock(Message.class);
+ EasyMock.expect(message.get(Message.PARTIAL_RESPONSE_MESSAGE)).andReturn(Boolean.TRUE);
+ control.replay();
+ interceptor.handleMessage(message);
+ control.verify();
+
+ control.reset();
+ EasyMock.expect(message.get(Message.PARTIAL_RESPONSE_MESSAGE)).andReturn(null);
EasyMock.expect(message.get(AssertionInfoMap.class)).andReturn(null);
control.replay();
interceptor.handleMessage(message);
@@ -73,6 +80,7 @@
c.add(ai3);
aim.put(n2, c);
+ EasyMock.expect(message.get(Message.PARTIAL_RESPONSE_MESSAGE)).andReturn(null);
EasyMock.expect(message.get(AssertionInfoMap.class)).andReturn(aim);
control.replay();