Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 22872 invoked from network); 9 Mar 2010 00:21:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Mar 2010 00:21:15 -0000 Received: (qmail 75852 invoked by uid 500); 9 Mar 2010 00:20:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 75803 invoked by uid 500); 9 Mar 2010 00:20:50 -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 75796 invoked by uid 99); 9 Mar 2010 00:20:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 00:20:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 09 Mar 2010 00:20:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8D1F12388900; Tue, 9 Mar 2010 00:20:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r920582 - in /cxf/branches/2.2.x-fixes: ./ distribution/bundle/all/pom.xml distribution/bundle/minimal/pom.xml Date: Tue, 09 Mar 2010 00:20:25 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100309002025.8D1F12388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Mar 9 00:20:25 2010 New Revision: 920582 URL: http://svn.apache.org/viewvc?rev=920582&view=rev Log: Merged revisions 920567 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r920567 | dkulp | 2010-03-08 18:40:18 -0500 (Mon, 08 Mar 2010) | 2 lines [CXF-2694] Make security imports optional Patch from S. Ali Tokmen applied ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Propchange: cxf/branches/2.2.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=920582&r1=920581&r2=920582&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Tue Mar 9 00:20:25 2010 @@ -280,6 +280,7 @@ org.apache.log4j*;resolution:=optional, org.apache.velocity*;resolution:=optional, org.apache.xmlbeans*;resolution:=optional, + org.apache.xml.security*;resolution:=optional, org.apache.ws.security*;resolution:=optional, org.codehaus.jra*;resolution:=optional, org.codehaus.jettison*;resolution:=optional, Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=920582&r1=920581&r2=920582&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Tue Mar 9 00:20:25 2010 @@ -182,6 +182,7 @@ org.apache.log4j*;resolution:=optional, org.apache.velocity*;resolution:=optional, org.apache.xmlbeans*;resolution:=optional, + org.apache.xml.security*;resolution:=optional, org.apache.ws.security*;resolution:=optional, org.codehaus.jra*;resolution:=optional, org.codehaus.jettison*;resolution:=optional,