Author: hibou
Date: Tue Aug 21 18:57:04 2012
New Revision: 1375716
URL: http://svn.apache.org/viewvc?rev=1375716&view=rev
Log:
Fix the buggy use of File.toURL()
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java?rev=1375716&r1=1375715&r2=1375716&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
Tue Aug 21 18:57:04 2012
@@ -69,7 +69,7 @@ public class IvySettingsFile extends Ivy
urls.add(new URL(substitute(m.group(1))));
} catch (MalformedURLException e) {
try {
- urls.add(new File(substitute(m.group(1))).toURL());
+ urls.add(new File(substitute(m.group(1))).toURI().toURL());
} catch (MalformedURLException e1) {
// ignored
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=1375716&r1=1375715&r2=1375716&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
Tue Aug 21 18:57:04 2012
@@ -189,7 +189,7 @@ public class IvyClasspathContainer imple
return ivy
.getResolutionCacheManager()
.getConfigurationResolveReportInCache(resolveId,
md.getConfigurationsNames()[0])
- .toURL();
+ .toURI().toURL();
} catch (MalformedURLException e) {
// should never happen
throw new RuntimeException(e);
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java?rev=1375716&r1=1375715&r2=1375716&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java
Tue Aug 21 18:57:04 2012
@@ -317,7 +317,7 @@ public class IvyClasspathContainerMapper
if (path != null) {
String u;
try {
- u = "jar:" + path.toFile().toURL().toExternalForm() + "!/";
+ u = "jar:" +
path.toFile().toURI().toURL().toExternalForm() + "!/";
try {
url = new URL(u);
} catch (MalformedURLException e) {
