Return-Path: 
 <commits-return-21419-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 14A19DB15
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed,  8 Aug 2012 19:48:34 +0000 (UTC)
Received: (qmail 19361 invoked by uid 500); 8 Aug 2012 19:48:34 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 19312 invoked by uid 500); 8 Aug 2012 19:48:33 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 19305 invoked by uid 99); 8 Aug 2012 19:48:33 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Aug 2012 19:48:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Aug 2012 19:48:32 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9CD692388906
	for <commits@cxf.apache.org>; Wed,  8 Aug 2012 19:47:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r828410 - in /websites/production/cxf/content:
 cache/docs.pageCache docs/ws-security.html
Date: Wed, 08 Aug 2012 19:47:49 -0000
To: commits@cxf.apache.org
From: buildbot@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120808194749.9CD692388906@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: buildbot
Date: Wed Aug  8 19:47:49 2012
New Revision: 828410

Log:
Production update by buildbot for cxf

Modified:
    websites/production/cxf/content/cache/docs.pageCache
    websites/production/cxf/content/docs/ws-security.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/ws-security.html
==============================================================================
--- websites/production/cxf/content/docs/ws-security.html (original)
+++ websites/production/cxf/content/docs/ws-security.html Wed Aug  8 19:47:49 2012
@@ -127,7 +127,7 @@ Apache CXF -- WS-Security
 <ul><li>Pass authentication tokens between services</li><li>Encrypt messages or parts of messages</li><li>Sign messages</li><li>Timestamp messages</li></ul>
 
 
-<p>Currently, CXF implements WS-Security by integrating <a shape="rect" class="external-link" href="http://ws.apache.org/wss4j">WSS4J</a>. To use the integration, you'll need to configure these interceptors and add them to your service and/or client as detailed in this article. Alternatively, WS-Security can be implemented by using <a shape="rect" href="http://cxf.apache.org/docs/ws-securitypolicy.html">WS-SecurityPolicy</a>, which provides a more comprehensive and sophisticated validation of the security properties of a received message.</p>
+<p>CXF relies on <a shape="rect" class="external-link" href="http://ws.apache.org/wss4j">WSS4J</a> in large part to implement WS-Security.  Within your own services, WS-Security can be activated by using <a shape="rect" href="http://cxf.apache.org/docs/ws-securitypolicy.html">WS-SecurityPolicy</a>, which provides a comprehensive and sophisticated validation of the security properties of a received message.  A non-WS-SecurityPolicy approach is usually also possible by way of CXF interceptors added to your service and/or client as detailed in this article.</p>
 
 <h1><a shape="rect" name="WS-Security-Overviewofencryptionandsigning"></a>Overview of encryption and signing</h1>