Return-Path: 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 18DE599E6 for ; Mon, 25 Jun 2012 14:15:39 +0000 (UTC) Received: (qmail 91294 invoked by uid 500); 25 Jun 2012 14:15:39 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 91243 invoked by uid 500); 25 Jun 2012 14:15:39 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 91235 invoked by uid 99); 25 Jun 2012 14:15:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2012 14:15:38 +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; Mon, 25 Jun 2012 14:15:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4E52F2388865; Mon, 25 Jun 2012 14:15:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1353566 - in /cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security: sign_enc/README.txt ut_policy/README.txt ut_policy/wsdl/hello_world.wsdl Date: Mon, 25 Jun 2012 14:15:13 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120625141514.4E52F2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Mon Jun 25 14:15:12 2012 New Revision: 1353566 URL: http://svn.apache.org/viewvc?rev=1353566&view=rev Log: Merged revisions 1353563 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1353563 | coheigea | 2012-06-25 15:11:31 +0100 (Mon, 25 Jun 2012) | 10 lines Merged revisions 1353560 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1353560 | coheigea | 2012-06-25 15:05:34 +0100 (Mon, 25 Jun 2012) | 2 lines Updating policy for one of the WS-Security samples ........ ........ Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt?rev=1353566&r1=1353565&r2=1353566&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt Mon Jun 25 14:15:12 2012 @@ -49,7 +49,7 @@ Using either UNIX or Windows: mvn install (builds the demo) mvn -Pserver (from one command line window) - Mvn -Pclient (from a second command line window) + mvn -Pclient (from a second command line window) On startup, the client makes a sequence of 4 two-way invocations. Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt?rev=1353566&r1=1353565&r2=1353566&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt Mon Jun 25 14:15:12 2012 @@ -47,7 +47,7 @@ Using either UNIX or Windows: mvn install (builds the demo) mvn -Pserver (from one command line window) - Mvn -Pclient (from a second command line window) + mvn -Pclient (from a second command line window) On startup, the client makes one invocation. Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl?rev=1353566&r1=1353565&r2=1353566&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Mon Jun 25 14:15:12 2012 @@ -88,19 +88,45 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -