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 2BDB4973E for ; Fri, 17 Feb 2012 17:25:32 +0000 (UTC) Received: (qmail 78203 invoked by uid 500); 17 Feb 2012 17:25:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 78119 invoked by uid 500); 17 Feb 2012 17:25:32 -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 78111 invoked by uid 99); 17 Feb 2012 17:25:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2012 17:25:32 +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; Fri, 17 Feb 2012 17:25:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 51CCB238897D; Fri, 17 Feb 2012 17:25:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1245669 - in /cxf/branches/2.4.x-fixes: ./ rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml Date: Fri, 17 Feb 2012 17:25:11 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120217172511.51CCB238897D@eris.apache.org> Author: dkulp Date: Fri Feb 17 17:25:10 2012 New Revision: 1245669 URL: http://svn.apache.org/viewvc?rev=1245669&view=rev Log: Merged revisions 1245666 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1245666 | dkulp | 2012-02-17 12:24:16 -0500 (Fri, 17 Feb 2012) | 9 lines Merged revisions 1245664 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245664 | dkulp | 2012-02-17 12:22:04 -0500 (Fri, 17 Feb 2012) | 2 lines Use a valid policy ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml?rev=1245669&r1=1245668&r2=1245669&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml Fri Feb 17 17:25:10 2012 @@ -20,6 +20,8 @@ - + + + \ No newline at end of file