Author: coheigea Date: Fri Oct 5 15:23:16 2012 New Revision: 1394580 URL: http://svn.apache.org/viewvc?rev=1394580&view=rev Log: Merged revisions 1394570 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1394570 | coheigea | 2012-10-05 16:11:14 +0100 (Fri, 05 Oct 2012) | 18 lines Merged revisions 1394564 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1394564 | coheigea | 2012-10-05 16:04:35 +0100 (Fri, 05 Oct 2012) | 10 lines Merged revisions 1394559 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1394559 | coheigea | 2012-10-05 15:56:45 +0100 (Fri, 05 Oct 2012) | 2 lines [CXF-4545] - ut_sign + sign_enc samples broken in last releases ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1394580&r1=1394579&r2=1394580&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java Fri Oct 5 15:23:16 2012 @@ -73,7 +73,8 @@ public final class Client { outProps.put("signatureKeyIdentifier", "DirectReference"); outProps.put("signatureParts", "{Element}{" + WSU_NS + "}Timestamp;" - + "{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body";); + + "{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;"; + + "{}{http://www.w3.org/2005/08/addressing}ReplyTo;";); bus.getOutInterceptors().add(new WSS4JOutInterceptor(outProps)); Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java?rev=1394580&r1=1394579&r2=1394580&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java Fri Oct 5 15:23:16 2012 @@ -64,7 +64,8 @@ public final class Client { outProps.put("signatureKeyIdentifier", "DirectReference"); outProps.put("signatureParts", "{Element}{" + WSU_NS + "}Timestamp;" - + "{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body";); + + "{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;"; + + "{}{http://www.w3.org/2005/08/addressing}ReplyTo;";); bus.getOutInterceptors().add(new WSS4JOutInterceptor(outProps)); @@ -81,8 +82,6 @@ public final class Client { // Check to make sure that the SOAP Body and Timestamp were signed DefaultCryptoCoverageChecker coverageChecker = new DefaultCryptoCoverageChecker(); - coverageChecker.setSignBody(true); - coverageChecker.setSignTimestamp(true); bus.getInInterceptors().add(coverageChecker); GreeterService service = new GreeterService(); Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java?rev=1394580&r1=1394579&r2=1394580&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java Fri Oct 5 15:23:16 2012 @@ -81,8 +81,6 @@ public class Server { // Check to make sure that the SOAP Body and Timestamp were signed DefaultCryptoCoverageChecker coverageChecker = new DefaultCryptoCoverageChecker(); - coverageChecker.setSignBody(true); - coverageChecker.setSignTimestamp(true); bus.getInInterceptors().add(coverageChecker); BusFactory.setDefaultBus(bus);
