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/02/17 18:12:02 UTC

git commit: [KARAF-1532] Support wrap: URL in features XML when installing kar

Repository: karaf
Updated Branches:
  refs/heads/master 8c90fafb1 -> 14429c940


[KARAF-1532] Support wrap: URL in features XML when installing kar


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/14429c94
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/14429c94
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/14429c94

Branch: refs/heads/master
Commit: 14429c9401c393b960b7b6ff1f8b1604237f3e02
Parents: 8c90faf
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Feb 17 18:11:20 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Feb 17 18:11:20 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/karaf/tooling/features/InstallKarsMojo.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/14429c94/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
index 98e7963..c3bd30b 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
@@ -282,6 +282,10 @@ public class InstallKarsMojo extends MojoSupport {
             for (Bundle bundle : feature.getBundle()) {
                 if (!bundle.isDependency()) {
                     String key = bundle.getLocation();
+                    // remove wrap: protocol to resolve from maven
+                    if (key.startsWith("wrap:")) {
+                        key = key.substring(5);
+                    }
                     String path = MavenUtil.pathFromMaven(key);
                     File test = new File(system.resolve(path));
                     if (!test.exists()) {