maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snic...@apache.org
Subject svn commit: r358048 - in /maven/sandbox/plugins: maven-ejb3-plugin/src/main/java/org/apache/maven/plugin/ejb3/Ejb3Mojo.java maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParMojo.java
Date Tue, 20 Dec 2005 17:35:07 GMT
Author: snicoll
Date: Tue Dec 20 09:34:56 2005
New Revision: 358048

URL: http://svn.apache.org/viewcvs?rev=358048&view=rev
Log:
MNG-1690: Fixed NPE in ejb3 and par plugins
Submitted by: Tim Kettler
Reviewed by: Stephane Nicoll

Modified:
    maven/sandbox/plugins/maven-ejb3-plugin/src/main/java/org/apache/maven/plugin/ejb3/Ejb3Mojo.java
    maven/sandbox/plugins/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParMojo.java

Modified: maven/sandbox/plugins/maven-ejb3-plugin/src/main/java/org/apache/maven/plugin/ejb3/Ejb3Mojo.java
URL: http://svn.apache.org/viewcvs/maven/sandbox/plugins/maven-ejb3-plugin/src/main/java/org/apache/maven/plugin/ejb3/Ejb3Mojo.java?rev=358048&r1=358047&r2=358048&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-ejb3-plugin/src/main/java/org/apache/maven/plugin/ejb3/Ejb3Mojo.java
(original)
+++ maven/sandbox/plugins/maven-ejb3-plugin/src/main/java/org/apache/maven/plugin/ejb3/Ejb3Mojo.java
Tue Dec 20 09:34:56 2005
@@ -22,6 +22,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
 
 import java.io.File;
 import java.io.IOException;
@@ -97,6 +98,14 @@
     private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
 
     /**
+     * The Jar archiver.
+     *
+     * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+     * @required
+     */
+     private JarArchiver jarArchiver;
+
+    /**
      * Generates the EJB3.
      *
      * @todo Add license files in META-INF directory.
@@ -122,6 +131,7 @@
         File ejb3File = new File( basedir, finalName + ".ejb3" );
 
         MavenArchiver archiver = new MavenArchiver();
+        archiver.setArchiver( jarArchiver );
 
         archiver.setOutputFile( ejb3File );
 

Modified: maven/sandbox/plugins/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParMojo.java
URL: http://svn.apache.org/viewcvs/maven/sandbox/plugins/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParMojo.java?rev=358048&r1=358047&r2=358048&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParMojo.java
(original)
+++ maven/sandbox/plugins/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParMojo.java
Tue Dec 20 09:34:56 2005
@@ -22,6 +22,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
 
 import java.io.File;
 import java.io.IOException;
@@ -101,6 +102,14 @@
      */
     private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
 
+     /**
+     * The Jar archiver.
+     *
+     * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+     * @required
+     */
+     private JarArchiver jarArchiver;
+
     /**
      * Generates the PAR.
      *
@@ -137,6 +146,7 @@
         File parFile = new File( basedir, finalName + ".par" );
 
         MavenArchiver archiver = new MavenArchiver();
+        archiver.setArchiver( jarArchiver );
 
         archiver.setOutputFile( parFile );
 



Mime
View raw message