felix-commits mailing list archives

Author: chirino
Date: Tue Feb  1 20:54:49 2011
New Revision: 1066202

URL: http://svn.apache.org/viewvc?rev=1066202&view=rev
Log:
Fixes FELIX-2817 : The maven-bundle-plugin manifest goal should honor the supportedProjectTypes
configuration setting.

Modified:
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.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=1066202&r1=1066201&r2=1066202&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
Tue Feb  1 20:54:49 2011
@@ -113,7 +113,7 @@ public class BundlePlugin extends Abstra
      *
      * @parameter
      */
-    private List supportedProjectTypes = Arrays.asList( new String[]
+    protected List supportedProjectTypes = Arrays.asList( new String[]
         { "jar", "bundle" } );
 
     /**

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=1066202&r1=1066201&r2=1066202&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
Tue Feb  1 20:54:49 2011
@@ -55,7 +55,7 @@ public class ManifestPlugin extends Bund
         Manifest manifest;
         try
         {
-            if ( "bundle".equals( project.getPackaging() ) )
+            if ( supportedProjectTypes.contains( getProject().getArtifact().getType() ) )
             {
                 Builder builder = buildOSGiBundle( project, instructions, properties, classpath
);
                 manifest = builder.getJar().getManifest();