From scm-return-10684-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Thu Mar 02 03:07:36 2006 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 76497 invoked from network); 2 Mar 2006 03:07:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Mar 2006 03:07:36 -0000 Received: (qmail 28738 invoked by uid 500); 2 Mar 2006 03:08:22 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 28622 invoked by uid 500); 2 Mar 2006 03:08:22 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 28611 invoked by uid 99); 2 Mar 2006 03:08:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Mar 2006 19:08:21 -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; Wed, 01 Mar 2006 19:08:21 -0800 Received: (qmail 76417 invoked by uid 65534); 2 Mar 2006 03:07:13 -0000 Message-ID: <20060302030713.76416.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r382256 - in /geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools: DownloadMojo.java InstallPluginDependenciesMojo.java Date: Thu, 02 Mar 2006 03:07:13 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Wed Mar 1 19:07:10 2006 New Revision: 382256 URL: http://svn.apache.org/viewcvs?rev=382256&view=rev Log: support for extracting gz distros Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java?rev=382256&r1=382255&r2=382256&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java Wed Mar 1 19:07:10 2006 @@ -21,10 +21,9 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugin.install.InstallFileMojo; -import org.apache.maven.project.MavenProject; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Expand; +import org.apache.tools.ant.taskdefs.GUnzip; import org.apache.tools.ant.taskdefs.Get; import org.apache.tools.ant.taskdefs.Untar; @@ -39,12 +38,6 @@ + "distributions/"; /** - * @parameter expression="${project}" - * @required - */ - private MavenProject project; - - /** * @parameter expression="${settings.localRepository}" */ private String localRepoLoc; @@ -115,8 +108,28 @@ } private void install(File file) { + + if (file.getName().endsWith("tar.gz")) { + String path = file.getAbsolutePath(); + File tarDist = new File(path.substring(0, path.indexOf(".gz"))); + if (!tarDist.exists()) { + GUnzip task = new GUnzip(); + task.setProject(new Project()); + task.setSrc(file); + task.setDest(file.getParentFile()); + task.execute(); + } + file = tarDist; + } + + Expand expandTask = null; if (file.getName().endsWith(".zip")) { - Expand expandTask = new Expand(); + expandTask = new Expand(); + } else if (file.getName().endsWith("tar")) { + expandTask = new Untar(); + } + + if (expandTask != null) { expandTask.setProject(new Project()); expandTask.setSrc(file); expandTask.setDest(installDir); Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java?rev=382256&r1=382255&r2=382256&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java Wed Mar 1 19:07:10 2006 @@ -31,8 +31,6 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; -import sun.security.action.GetLongAction; - /** * @goal install */