felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r1207309 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
Date Mon, 28 Nov 2011 15:35:44 GMT
Author: mcculls
Date: Mon Nov 28 15:35:44 2011
New Revision: 1207309

URL: http://svn.apache.org/viewvc?rev=1207309&view=rev
Log:
FELIX-3206: revert to old behaviour of generating manifest from the actual bundle content,
but allow people to generate manifests by rebuilding the bundle in-memory by setting <rebuildBundle>true</rebuildBundle>
in the configuration

Modified:
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java?rev=1207309&r1=1207308&r2=1207309&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
(original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
Mon Nov 28 15:35:44 2011
@@ -50,6 +50,14 @@ import aQute.lib.osgi.Resource;
  */
 public class ManifestPlugin extends BundlePlugin
 {
+    /**
+     * When true, generate the manifest by rebuilding the full bundle in memory 
+     *
+     * @parameter expression="${rebuildBundle}"
+     */
+    protected boolean rebuildBundle;
+
+
     @Override
     protected void execute( MavenProject project, Map instructions, Properties properties,
Jar[] classpath )
         throws MojoExecutionException
@@ -150,7 +158,7 @@ public class ManifestPlugin extends Bund
     protected Analyzer getAnalyzer( MavenProject project, Map instructions, Properties properties,
Jar[] classpath )
         throws IOException, MojoExecutionException, Exception
     {
-        if ( supportedProjectTypes.contains( project.getArtifact().getType() ) )
+        if ( rebuildBundle && supportedProjectTypes.contains( project.getArtifact().getType()
) )
         {
             return buildOSGiBundle( project, instructions, properties, classpath );
         }



Mime
View raw message