svn commit: r1369033 - /cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java

[coheigea]

Author: coheigea
Date: Fri Aug  3 15:26:32 2012
New Revision: 1369033

URL: http://svn.apache.org/viewvc?rev=1369033&view=rev
Log:
Merged revisions 1369028 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1369028 | coheigea | 2012-08-03 16:24:13 +0100 (Fri, 03 Aug 2012) | 7 lines

  Fixing distribution build

  Conflicts:

        
distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java

........

Modified:
    
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java

Modified: 
cxf/branches/2.5.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.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1369033&r1=1369032&r2=1369033&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
 Fri Aug  3 15:26:32 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);