X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms.jshell%2Fsrc%2Forg%2Fargeo%2Finternal%2Fcms%2Fjshell%2Fosgi%2FOsgiExecutionControlProvider.java;fp=org.argeo.cms.jshell%2Fsrc%2Forg%2Fargeo%2Finternal%2Fcms%2Fjshell%2Fosgi%2FOsgiExecutionControlProvider.java;h=67515e69cbf8c1f0de8c19014e6b5e87b5cf75e8;hp=9ebf97ed07be957c25203e409a9272986a9badf5;hb=b95462873703848193e56fcbe997693630db6121;hpb=55d88fba80cec198a0f11ba7545e19878c51fc5e diff --git a/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java b/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java index 9ebf97ed0..67515e69c 100644 --- a/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java +++ b/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java @@ -212,7 +212,7 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider { static Path bundleToPath(Path frameworkLocation, Bundle bundle) throws IOException { String location = bundle.getLocation(); - if (location.startsWith("initial@reference:file:")) { + if (location.startsWith("initial@reference:file:")) {// Eclipse IDE environment location = location.substring("initial@reference:file:".length()); Path p = frameworkLocation.getParent().resolve(location).toAbsolutePath(); if (Files.exists(p)) { @@ -225,6 +225,15 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider { log.warn("Ignore bundle " + p + " as it does not exist"); return null; } + } else if (location.startsWith("reference:file:")) {// a2+reference + location = location.substring("reference:".length()); + Path p = Paths.get(URI.create(location)); + if (Files.exists(p)) { + return p; + } else { + log.warn("Ignore bundle " + p + " as it does not exist"); + return null; + } } Path p = Paths.get(location); return p;