You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2015/09/29 14:21:55 UTC
karaf git commit: correctly handle the file: uri in startup.properties
Repository: karaf
Updated Branches:
refs/heads/master f2f355ff7 -> 31ff1dbbd
correctly handle the file: uri in startup.properties
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/31ff1dbb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/31ff1dbb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/31ff1dbb
Branch: refs/heads/master
Commit: 31ff1dbbd04b4ccb0a2e1b9b2b2edb3961b1c824
Parents: f2f355f
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Sep 29 20:21:03 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Sep 29 20:21:03 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/karaf/main/util/SimpleMavenResolver.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/31ff1dbb/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java b/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
index b703c58..69d787a 100644
--- a/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
+++ b/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
@@ -62,6 +62,10 @@ public class SimpleMavenResolver implements ArtifactResolver {
private static File findFile(File dir, URI mvnUri) {
try {
String path = Parser.pathFromMaven(mvnUri.toString());
+ if (path.startsWith("file:")) {
+ path = path.substring("file:".length());
+ }
+
File theFile = new File(dir, path);
if (theFile.exists() && !theFile.isDirectory()) {