Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 BE18010747 for ; Fri, 7 Jun 2013 21:24:49 +0000 (UTC) Received: (qmail 91493 invoked by uid 500); 7 Jun 2013 21:24:49 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 91455 invoked by uid 500); 7 Jun 2013 21:24:49 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 91448 invoked by uid 99); 7 Jun 2013 21:24:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 21:24:49 +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, 07 Jun 2013 21:24:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5CBDC2388847; Fri, 7 Jun 2013 21:24:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1490836 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Date: Fri, 07 Jun 2013 21:24:27 -0000 To: commits@felix.apache.org From: mcculls@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130607212427.5CBDC2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcculls Date: Fri Jun 7 21:24:26 2013 New Revision: 1490836 URL: http://svn.apache.org/r1490836 Log: FELIX-3352: pass external filter properties to bnd for processing Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1490836&r1=1490835&r2=1490836&view=diff ============================================================================== --- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original) +++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Fri Jun 7 21:24:26 2013 @@ -65,6 +65,7 @@ import org.codehaus.plexus.archiver.UnAr import org.codehaus.plexus.archiver.manager.ArchiverManager; import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.PropertyUtils; import org.codehaus.plexus.util.StringUtils; import aQute.bnd.osgi.Analyzer; @@ -1210,6 +1211,16 @@ public class BundlePlugin extends Abstra properties.putAll( currentProject.getProperties() ); properties.putAll( currentProject.getModel().getProperties() ); + + for ( Iterator i = currentProject.getFilters().iterator(); i.hasNext(); ) + { + File filterFile = new File( ( String ) i.next() ); + if ( filterFile.isFile() ) + { + properties.putAll( PropertyUtils.loadProperties( filterFile ) ); + } + } + if ( m_mavenSession != null ) { try