Revert commit 7131e1c028e0035de548c6b37e1e8c9624417440.
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/0712acab Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/0712acab Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/0712acab Branch: refs/heads/master Commit: 0712acabd53419090cb2b053c43eb8c2574b8acc Parents: ab8112e Author: Jaikiran Pai <[email protected]> Authored: Mon Sep 10 19:04:42 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Mon Sep 10 19:04:42 2018 +0530 ---------------------------------------------------------------------- .../cache/DefaultRepositoryCacheManager.java | 3 ++- .../cache/DefaultRepositoryCacheManagerTest.java | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0712acab/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java index 91257b0..540cf92 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java @@ -19,6 +19,7 @@ package org.apache.ivy.core.cache; import java.io.File; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -1010,7 +1011,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv if (useOrigin && artifactRes.isLocal()) { if (artifactRes instanceof LocalizableResource) { origin.setLocation(((LocalizableResource) artifactRes).getFile() - .toURI().toURL().toExternalForm()); + .getAbsolutePath()); } saveArtifactOrigin(artifact, origin); archiveFile = getArchiveFileInCache(artifact, origin); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0712acab/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java index ff00a32..2333802 100644 --- a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java +++ b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import java.net.URL; import java.util.Date; import org.apache.ivy.Ivy; @@ -49,7 +48,6 @@ import org.apache.ivy.util.Message; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -194,23 +192,6 @@ public class DefaultRepositoryCacheManagerTest { assertEquals(rmr11, rmrFromCache); } - /** - * Tests that the {@link ArtifactOrigin#getLocation()} and {@link ArtifactOrigin#setLocation(String)} values - * are treated as {@link URL} while saving and retrieving the artifact origin information - * - * @throws Exception - */ - @Test - public void testArtificationOriginalLocation() throws Exception { - final Artifact simpleArtifact = createArtifact("org", "dummy", "1.0.0", "hello", "jar", "jar"); - final URL location = new File("dummylocation").toURI().toURL(); - final ArtifactOrigin originatedFrom = new ArtifactOrigin(simpleArtifact, true, location.toExternalForm()); - cacheManager.saveArtifactOrigin(simpleArtifact, originatedFrom); - final ArtifactOrigin restored = cacheManager.getSavedArtifactOrigin(simpleArtifact); - Assert.assertNotNull("Location of artifact origin wasn't expected to be null", restored.getLocation()); - Assert.assertEquals("Unexpected artifact origin location", location, new URL(restored.getLocation())); - } - private static DefaultArtifact createArtifact(String org, String module, String rev, String name, String type, String ext) { ModuleId mid = new ModuleId(org, module);
