X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.lib.detached%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Flib%2Fdetached%2FDetachedLauncher.java;h=6f06d24d2c48781c7e37e6ee846f146593a29d3a;hb=e936138539c9df6c8e123620cf38d7a556526297;hp=825a9717d91efec1fbb1cb1b0a2996775a1abd2d;hpb=91ec63b012729bdfa5fb3854bf9e9dd5f6d6ac91;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java index 825a9717d..6f06d24d2 100644 --- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java +++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java @@ -68,6 +68,7 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware, else if (xercesBundleName.equals(name) && prependXmlJars) getPBootClasspath().add(asResource(bundle.getLocation())); + location = removeInitialReference(location); if (location.startsWith("file:")) { File file = new File(location.substring("file:".length())); if (osgiLocations.length() != 0) @@ -89,12 +90,17 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware, protected Resource findOsgiboot(Bundle bundle) { String location = bundle.getLocation(); + location = removeInitialReference(location); + return asResource(location); + } + + protected String removeInitialReference(String location){ if (location.startsWith("initial@reference:file:")) location = System.getProperty("osgi.install.area") + location.substring("initial@reference:file:".length()); if (location.charAt(location.length() - 1) == '/') location.substring(0, location.length() - 1); - return asResource(location); + return location; } protected Resource asResource(String location) {