Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 60673 invoked from network); 20 Dec 2005 17:35:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Dec 2005 17:35:41 -0000 Received: (qmail 32763 invoked by uid 500); 20 Dec 2005 17:35:30 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 32700 invoked by uid 500); 20 Dec 2005 17:35:30 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 32646 invoked by uid 99); 20 Dec 2005 17:35:30 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2005 09:35:30 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 20 Dec 2005 09:35:28 -0800 Received: (qmail 60282 invoked by uid 65534); 20 Dec 2005 17:35:07 -0000 Message-ID: <20051220173507.60281.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@maven.apache.org From: snicoll@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 );