Merge fix for osgiboot forcing jars to be installed as file: instead of reference...

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

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 999d8b16459f828aa9ada7993c9b70c4a872aab4..300ebb82dd48ba2802b3328cd832fd3a3dc1dbbe 100644 (file)
--- 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. */