svn commit: r1050337 - /felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java

[cl...@apache.org]

Author: clement
Date: Fri Dec 17 10:25:41 2010
New Revision: 1050337

URL: http://svn.apache.org/viewvc?rev=1050337&view=rev
Log:
Fix FELIX-2733
Add JAR and WAR as supported packaging types
Change how the output file is read.

Modified:
    felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java

Modified: felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java?rev=1050337&r1=1050336&r2=1050337&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java (original)
+++ felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java Fri Dec 17 10:25:41 2010
@@ -1,4 +1,4 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -62,14 +62,6 @@ public class ManipulatorMojo extends Abs
     private File m_outputDirectory;
 
     /**
-     * The name of the generated JAR file.
-     *
-     * @parameter alias="jarName" expression="${project.build.finalName}"
-     * @required
-     */
-    private String m_jarName;
-
-    /**
      * Location of the metadata file or iPOJO metadata configuration.
      * @parameter alias="metadata" default-value="metadata.xml"
      */
@@ -102,7 +94,7 @@ public class ManipulatorMojo extends Abs
      * Project types which this plugin supports.
      * @parameter
      */
-    private List m_supportedProjectTypes = Arrays.asList(new String[]{"bundle"});
+    private List m_supportedProjectTypes = Arrays.asList(new String[]{"bundle", "jar", "war"});
 
     /**
      * Ignore annotations parameter.
@@ -179,8 +171,8 @@ public class ManipulatorMojo extends Abs
             }
         }
 
-        // Get input bundle
-        File in = new File(m_buildDirectory + File.separator + m_jarName + ".jar");
+        // Get input bundle, we use the already create artifact.
+        File in = m_project.getArtifact().getFile();
         getLog().info("Input Bundle File : " + in.getAbsolutePath());
         if (!in.exists()) {
             throw new MojoExecutionException("the specified bundle file does not exist");