felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r1490836 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Date Fri, 07 Jun 2013 21:24:27 GMT
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



Mime
View raw message