Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 29828 invoked from network); 12 Oct 2006 15:43:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Oct 2006 15:43:04 -0000 Received: (qmail 63279 invoked by uid 500); 12 Oct 2006 15:43:04 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 63240 invoked by uid 500); 12 Oct 2006 15:43:04 -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 63227 invoked by uid 99); 12 Oct 2006 15:43:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2006 08:43:03 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2006 08:43:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 235511A981A; Thu, 12 Oct 2006 08:42:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r463285 - /maven/components/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java Date: Thu, 12 Oct 2006 15:42:41 -0000 To: commits@maven.apache.org From: kenney@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061012154242.235511A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: kenney Date: Thu Oct 12 08:42:40 2006 New Revision: 463285 URL: http://svn.apache.org/viewvc?view=rev&rev=463285 Log: Removed catch of IOException - not thrown anymode by UnArchiver Modified: maven/components/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java Modified: maven/components/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java?view=diff&rev=463285&r1=463284&r2=463285 ============================================================================== --- maven/components/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java (original) +++ maven/components/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java Thu Oct 12 08:42:40 2006 @@ -1,31 +1,30 @@ package org.apache.maven.script.ant; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.ContextEnabled; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DependencyResolutionRequiredException; -import org.apache.tools.ant.types.Path; import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Path; +import org.codehaus.plexus.archiver.ArchiverException; +import org.codehaus.plexus.archiver.UnArchiver; +import org.codehaus.plexus.archiver.zip.ZipUnArchiver; import org.codehaus.plexus.component.MapOrientedComponent; import org.codehaus.plexus.component.configurator.ComponentConfigurationException; import org.codehaus.plexus.component.factory.ant.AntComponentExecutionException; import org.codehaus.plexus.component.factory.ant.AntScriptInvoker; import org.codehaus.plexus.component.repository.ComponentRequirement; -import org.codehaus.plexus.archiver.UnArchiver; -import org.codehaus.plexus.archiver.ArchiverException; -import org.codehaus.plexus.archiver.zip.ZipUnArchiver; import org.codehaus.plexus.util.StringUtils; -import java.util.Map; -import java.util.Collection; -import java.util.List; +import java.io.File; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; -import java.io.File; -import java.io.IOException; +import java.util.List; +import java.util.Map; /** @@ -102,7 +101,7 @@ private void unpackFileBasedResources() throws MojoExecutionException { - // What we need to write out any resources in the plugin to the target directory of the + // What we need to write out any resources in the plugin to the target directory of the // mavenProject using the Ant-based plugin: // // 1. Need a reference to the plugin JAR itself @@ -121,10 +120,6 @@ ua.extract( resourcesPath, outputDirectory ); } catch ( ArchiverException e ) - { - throw new MojoExecutionException( "Error extracting resources from your Ant-based plugin.", e ); - } - catch( IOException e ) { throw new MojoExecutionException( "Error extracting resources from your Ant-based plugin.", e ); }