commit 04da547ce09bf03eee52a72c761eb2f4958ff70a
author Guillaume Nodet <gnodet@apache.org> Wed Mar 04 12:08:38 2015 +0000
committer Guillaume Nodet <gnodet@apache.org> Wed Mar 04 12:08:38 2015 +0000
tree 4c3b80bf49fe767381746df8b6aab412ebd1563a
parent e8eb002bc09d879e328c460ef67fc0d0d0142788

[FELI-4824] Add support for prepending instructions

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1663957 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 83dcc25..4d3074f 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -239,6 +239,7 @@
     private static final String MAVEN_SOURCES = "{maven-sources}";
     private static final String MAVEN_TEST_SOURCES = "{maven-test-sources}";
     private static final String BUNDLE_PLUGIN_EXTENSION = "BNDExtension-";
+    private static final String BUNDLE_PLUGIN_PREPEND_EXTENSION = "BNDPrependExtension-";
 
     private static final String[] EMPTY_STRING_ARRAY =
         {};
@@ -481,12 +482,27 @@
                     addProps.put(oKey, currentValue + ',' + entry.getValue());
                 }
             }
+            if ( key.startsWith(BUNDLE_PLUGIN_PREPEND_EXTENSION) )
+            {
+                final String oKey = key.substring(BUNDLE_PLUGIN_PREPEND_EXTENSION.length());
+                final String currentValue = properties.getProperty(oKey);
+                if ( currentValue == null )
+                {
+                    addProps.put(oKey, entry.getValue());
+                }
+                else
+                {
+                    addProps.put(oKey, entry.getValue() + "," + currentValue);
+                }
+            }
         }
         properties.putAll( addProps );
         final Iterator keyIter = addProps.keySet().iterator();
         while ( keyIter.hasNext() )
         {
-            properties.remove(BUNDLE_PLUGIN_EXTENSION + keyIter.next());
+            Object key = keyIter.next();
+            properties.remove(BUNDLE_PLUGIN_EXTENSION + key);
+            properties.remove(BUNDLE_PLUGIN_PREPEND_EXTENSION + key);
         }
 
         if (properties.getProperty("Bundle-Activator") != null