You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2005/12/10 05:50:29 UTC
svn commit: r355713 -
/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
Author: jsisson
Date: Fri Dec 9 20:50:08 2005
New Revision: 355713
URL: http://svn.apache.org/viewcvs?rev=355713&view=rev
Log:
fix problem with installation of car files on windows when directories contain spaces
Modified:
geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java?rev=355713&r1=355712&r2=355713&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Fri Dec 9 20:50:08 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,10 +133,17 @@
}
URI configId = configurationData.getId();
URL targetURL = repository.getURL(configId);
- File targetFile = new File(targetURL.getPath());
- File parentFile = targetFile.getParentFile();
- parentFile.mkdirs();
- targetFile.createNewFile();
+ 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);
}