svn commit: r811464 - /maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java

[pg...@apache.org]

Author: pgier
Date: Fri Sep  4 16:12:24 2009
New Revision: 811464

URL: http://svn.apache.org/viewvc?rev=811464&view=rev
Log:
[MANT-59] Add support for the bundle packaging.

Modified:
    maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java

Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=811464&r1=811463&r2=811464&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java Fri Sep  4 16:12:24 2009
@@ -568,14 +568,45 @@
     }
 
     /**
-     * @param mavenProject not null
-     * @return true if project packaging equals <code>jar</code> or <code>maven-plugin</code>
+     * @param mavenProject
+     * @return true if project packaging equals one of several packaging types 
+     *         including  <code>jar</code>, <code>maven-plugin</code>, <code>ejb</code>, or
+     *         <code>bundle</code>
      */
     public static boolean isJarPackaging( MavenProject mavenProject )
     {
         return mavenProject.getPackaging().toLowerCase().equals( "jar" )
-            || mavenProject.getPackaging().toLowerCase().equals( "ejb" )
-            || mavenProject.getPackaging().toLowerCase().equals( "maven-plugin" );
+            || isEjbPackaging( mavenProject )
+            || isMavenPluginPackaging( mavenProject )
+            || isBundlePackaging( mavenProject )
+            ;
+    }
+
+    /**
+     * @param mavenProject
+     * @return true if project packaging equals <code>bundle</code>
+     */
+    public static boolean isBundlePackaging( MavenProject mavenProject )
+    {
+        return mavenProject.getPackaging().toLowerCase().equals( "bundle" );
+    }
+
+    /**
+     * @param mavenProject
+     * @return true if project packaging equals <code>ejb</code>
+     */
+    public static boolean isEjbPackaging( MavenProject mavenProject )
+    {
+        return mavenProject.getPackaging().toLowerCase().equals( "ejb" );
+    }
+
+    /**
+     * @param mavenProject
+     * @return true if project packaging equals <code>maven-plugin</code>
+     */
+    public static boolean isMavenPluginPackaging( MavenProject mavenProject )
+    {
+        return mavenProject.getPackaging().toLowerCase().equals( "maven-plugin" );
     }
 
     /**