Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 17420 invoked from network); 15 Aug 2007 20:49:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2007 20:49:13 -0000 Received: (qmail 56194 invoked by uid 500); 15 Aug 2007 20:49:11 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 56038 invoked by uid 500); 15 Aug 2007 20:49:10 -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 56027 invoked by uid 99); 15 Aug 2007 20:49:10 -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:49:10 -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:49:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E69A1A981A; Wed, 15 Aug 2007 13:48:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r566338 - /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:48:48 -0000 To: scm@geronimo.apache.org From: hogstrom@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070815204849.0E69A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hogstrom Date: Wed Aug 15 13:48:48 2007 New Revision: 566338 URL: http://svn.apache.org/viewvc?view=rev&rev=566338 Log: PluginInstallerGBean fails to find available artifacts when the repository URL does not end with "/". 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=566338&r1=566337&r2=566338 ============================================================================== --- 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:48:48 2007 @@ -1181,11 +1181,11 @@ } for(int i=available.length-1; i>=0; i--) { Version version = available[i]; - URL metadataURL = new URL(url.toString()+base+"/"+version+"/maven-metadata.xml"); + URL metadataURL = new URL(url.toString().trim().endsWith("/") ? url : new URL(url.toString().trim()+"/"), base+"/"+version+"/maven-metadata.xml"); InputStream metadataStream = connect(metadataURL, username, password, monitor); if (metadataStream == null) { - metadataURL = new URL(url.toString()+base+"/"+version+"/maven-metadata-local.xml"); + metadataURL = new URL(url.toString().trim().endsWith("/") ? url : new URL(url.toString().trim()+"/"), base+"/"+version+"/maven-metadata-local.xml"); metadataStream = connect(metadataURL, username, password, monitor); } // check for a snapshot qualifier