Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 49987 invoked from network); 23 Apr 2007 13:49:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2007 13:49:46 -0000 Received: (qmail 41129 invoked by uid 500); 23 Apr 2007 13:49:52 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 41080 invoked by uid 500); 23 Apr 2007 13:49:52 -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 41069 invoked by uid 99); 23 Apr 2007 13:49:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2007 06:49:52 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2007 06:49:44 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 998C41A9838; Mon, 23 Apr 2007 06:49:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r531466 - /geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java Date: Mon, 23 Apr 2007 13:49:23 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070423134924.998C41A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sppatel Date: Mon Apr 23 06:49:15 2007 New Revision: 531466 URL: http://svn.apache.org/viewvc?view=rev&rev=531466 Log: improve error on no eclipse image Modified: geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java Modified: geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java?view=diff&rev=531466&r1=531465&r2=531466 ============================================================================== --- geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java (original) +++ geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java Mon Apr 23 06:49:15 2007 @@ -91,6 +91,8 @@ private Set bundleEntries = new HashSet(); private Set exportedEntries = new HashSet(); + + private File[] plugins; /* * (non-Javadoc) @@ -98,6 +100,12 @@ * @see org.apache.maven.plugin.Mojo#execute() */ public void execute() throws MojoExecutionException, MojoFailureException { + + File pluginsDir = new File(eclipseHome,"plugins"); + plugins = pluginsDir.listFiles(); + if(plugins == null || plugins.length == 0) { + throw new MojoFailureException("No plugins or plugins directory could be found at " + pluginsDir); + } addRequiredBundles(getManifestFromFile(manifestFile), false); @@ -174,8 +182,7 @@ if (bundle.isFile()) { manifest = new JarFile(bundle).getManifest(); } else { - File manifestFile = new File(bundle + File.separator - + MANIFEST_PATH); + File manifestFile = new File(bundle,MANIFEST_PATH); manifest = getManifestFromFile(manifestFile); } } else { @@ -207,12 +214,10 @@ } private File findBundleForDependency(String artifactId) { - File pluginsDir = new File(eclipseHome + File.separator + "plugins"); - File[] members = pluginsDir.listFiles(); - for (int i = 0; i < members.length; i++) { - String bundleName = InstallPluginDependenciesMojo.getBundleName(members[i]); + for (int i = 0; i < plugins.length; i++) { + String bundleName = InstallPluginDependenciesMojo.getBundleName(plugins[i]); if (artifactId.equals(bundleName)) - return members[i]; + return plugins[i]; } return null; }