Workaround for PAXURL-278

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

Branch: refs/heads/karaf-2.x
Commit: 0ad5d9f6b0f6f2fc080e8a6e98da419aa78ab20c
Parents: 96cb761
Author: Jonathan Anstey <[email protected]>
Authored: Fri Jun 20 10:01:12 2014 -0230
Committer: Jonathan Anstey <[email protected]>
Committed: Fri Jun 20 12:02:58 2014 -0230

----------------------------------------------------------------------
 main/src/main/java/org/apache/karaf/main/Main.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/0ad5d9f6/main/src/main/java/org/apache/karaf/main/Main.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/Main.java 
b/main/src/main/java/org/apache/karaf/main/Main.java
index 59b89a4..784b6fd 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -766,7 +766,9 @@ public class Main {
                     location = nextLocation(st);
                     if (location != null) {
                         try {
-                            String[] parts = 
convertToMavenUrlsIfNeeded(location, convertToMavenUrls);
+                            // TODO: Workaround for PAXURL-278
+                            String[] parts = 
location.contains("pax-url-aether") ? convertToMavenUrlsIfNeeded(location, 
false) 
+                                :  convertToMavenUrlsIfNeeded(location, 
convertToMavenUrls);
                             Bundle b = context.installBundle(parts[0], new 
URL(parts[1]).openStream());
                             sl.setBundleStartLevel(b, startLevel);
                             bundles.add(b);

Reply via email to