Author: coheigea
Date: Fri Aug 3 15:24:13 2012
New Revision: 1369028
URL: http://svn.apache.org/viewvc?rev=1369028&view=rev
Log:
Fixing distribution build
Conflicts:
distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1369028&r1=1369027&r2=1369028&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
Fri Aug 3 15:24:13 2012
@@ -89,7 +89,7 @@ public class Server {
bus.getInInterceptors().add(new WSS4JInInterceptor(inProps));
- // Check to make sure that the SOAP Body and Timestamp were signed,
+ // Check to make sure that the SOAP Body and Timestamp were signed,
// and that the SOAP Body was encrypted
DefaultCryptoCoverageChecker coverageChecker = new
DefaultCryptoCoverageChecker();
coverageChecker.setSignBody(true);