You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/08/07 21:54:17 UTC
git commit: [KARAF-3150] Parse MVN URL to get the kar name
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 4e2be7efd -> 62a1cef1b
[KARAF-3150] Parse MVN URL to get the kar name
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/62a1cef1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/62a1cef1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/62a1cef1
Branch: refs/heads/karaf-3.0.x
Commit: 62a1cef1b8a2fb832f90ef313c39674ad2a3e633
Parents: 4e2be7e
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Aug 7 21:53:22 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Aug 7 21:53:22 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/karaf/kar/internal/Kar.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/62a1cef1/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java
----------------------------------------------------------------------
diff --git a/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java b/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java
index 005cd17..078e8dd 100644
--- a/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java
+++ b/kar/core/src/main/java/org/apache/karaf/kar/internal/Kar.java
@@ -180,9 +180,18 @@ public class Kar {
public String getKarName() {
try {
- String karName = new File(karUri.toURL().getFile()).getName();
- karName = karName.substring(0, karName.lastIndexOf("."));
- return karName;
+ String url = karUri.toURL().toString();
+ if (url.startsWith("mvn")) {
+ int index = url.indexOf("/");
+ url = url.substring(index + 1);
+ index = url.indexOf("/");
+ url = url.substring(0, index);
+ return url;
+ } else {
+ String karName = new File(karUri.toURL().getFile()).getName();
+ karName = karName.substring(0, karName.lastIndexOf("."));
+ return karName;
+ }
} catch (MalformedURLException e) {
throw new RuntimeException("Invalid kar URI " + karUri, e);
}