From 2aad12277821c7c90e14ddaae3f31cd2cbd93307 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 19 Mar 2013 12:40:55 +0000 Subject: [PATCH] Merge fix for osgiboot forcing jars to be installed as file: instead of reference:file: https://www.argeo.org/bugzilla/show_bug.cgi?id=134 git-svn-id: https://svn.argeo.org/commons/branches/1.x@6164 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/osgi/boot/OsgiBoot.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java index 999d8b164..300ebb82d 100644 --- a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java +++ b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java @@ -849,15 +849,15 @@ public class OsgiBoot { /** Creates an URL from a location */ protected String locationToUrl(String baseUrl, String location) { - int extInd = location.lastIndexOf('.'); - String ext = null; - if (extInd > 0) - ext = location.substring(extInd); - - if (baseUrl.startsWith("reference:") && ".jar".equals(ext)) - return "file:" + location; - else - return baseUrl + location; + // int extInd = location.lastIndexOf('.'); + // String ext = null; + // if (extInd > 0) + // ext = location.substring(extInd); + // + // if (baseUrl.startsWith("reference:") && ".jar".equals(ext)) + // return "file:" + location; + // else + return baseUrl + location; } /** Transforms a relative path in a full system path. */ -- 2.30.2