Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 16787 invoked from network); 15 Aug 2007 20:46:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2007 20:46:46 -0000 Received: (qmail 52494 invoked by uid 500); 15 Aug 2007 20:46:44 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 52454 invoked by uid 500); 15 Aug 2007 20:46:44 -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 52443 invoked by uid 99); 15 Aug 2007 20:46:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2007 13:46:44 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Wed, 15 Aug 2007 20:47:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2EC9F1A981A; Wed, 15 Aug 2007 13:46:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r566336 - /geronimo/server/branches/2.0.1/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Date: Wed, 15 Aug 2007 20:46:21 -0000 To: scm@geronimo.apache.org From: hogstrom@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070815204621.2EC9F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hogstrom Date: Wed Aug 15 13:46:20 2007 New Revision: 566336 URL: http://svn.apache.org/viewvc?view=rev&rev=566336 Log: Plugin installer downloads a different version of dependency than the one specified Modified: geronimo/server/branches/2.0.1/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Modified: geronimo/server/branches/2.0.1/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0.1/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?view=diff&rev=566336&r1=566335&r2=566336 ============================================================================== --- geronimo/server/branches/2.0.1/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original) +++ geronimo/server/branches/2.0.1/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Wed Aug 15 13:46:20 2007 @@ -689,6 +689,20 @@ monitor.getResults().setCurrentMessage("Downloading " + configID); monitor.getResults().setCurrentFilePercent(-1); OpenResult result = openStream(configID, repos, username, password, monitor); + // Check if the result is already in server's repository + if(configManager.getArtifactResolver().queryArtifacts(result.getConfigID()).length > 0) { + String msg = "Not downloading "+configID+". Query for "+configID+" resulted in "+result.getConfigID() + +" which is already available in server's repository."; + monitor.getResults().setCurrentMessage(msg); + log.info(msg); + if(result.getStream() != null) { + try { + result.getStream().close(); + } catch(IOException ignored) { + } + } + return; + } try { File tempFile = downloadFile(result, monitor); if (tempFile == null) {