Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 63313 invoked from network); 10 Dec 2005 04:51:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Dec 2005 04:51:23 -0000 Received: (qmail 28242 invoked by uid 500); 10 Dec 2005 04:51:23 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 28093 invoked by uid 500); 10 Dec 2005 04:51: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 28082 invoked by uid 99); 10 Dec 2005 04:51:22 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2005 20:51:22 -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; Fri, 09 Dec 2005 20:51:21 -0800 Received: (qmail 63273 invoked by uid 65534); 10 Dec 2005 04:51:01 -0000 Message-ID: <20051210045101.63272.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r355714 - /geronimo/branches/1.0/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Date: Sat, 10 Dec 2005 04:51:01 -0000 To: scm@geronimo.apache.org From: jsisson@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jsisson Date: Fri Dec 9 20:50:51 2005 New Revision: 355714 URL: http://svn.apache.org/viewcvs?rev=355714&view=rev Log: fix problem with installation of car files on windows when directories contain spaces Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java?rev=355714&r1=355713&r2=355714&view=diff ============================================================================== --- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java (original) +++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Fri Dec 9 20:50:51 2005 @@ -22,6 +22,7 @@ import java.io.ObjectInputStream; import java.net.URI; import java.net.URL; +import java.net.URLDecoder; import java.util.List; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -132,7 +133,17 @@ } URI configId = configurationData.getId(); URL targetURL = repository.getURL(configId); - File targetFile = new File(targetURL.getPath()); + File targetFile; + if (targetURL.getProtocol().equalsIgnoreCase("file")) { + try { + targetFile = new File(URLDecoder.decode(targetURL.getFile(), "UTF-8")); + } catch (IOException e) { + throw new InvalidConfigException("Could not construct File for car location", e); + } + } else { + URI targetURI = URI.create(targetURL.toString()); + targetFile = new File(targetURI); + } ExecutableConfigurationUtil.createExecutableConfiguration(configurationData, null, source, targetFile); }