projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix framework location for JShell
[lgpl/argeo-commons.git]
/
org.argeo.cms.jshell
/
src
/
org
/
argeo
/
internal
/
cms
/
jshell
/
osgi
/
OsgiExecutionControlProvider.java
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 4a8f1685f769b0d622373cff420362902dbea124..66a0ed992eee0c4f26967dc1a241d40c57cbb8e8 100644
(file)
--- 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
@@
-179,9
+179,9
@@
public class OsgiExecutionControlProvider implements ExecutionControlProvider {
}
public static String getBundleClasspath(Long bundleId) throws IOException {
}
public static String getBundleClasspath(Long bundleId) throws IOException {
- String framework = System.getProperty("osgi.framework");
- Path frameworkLocation = Paths.get(URI.create(framework)).toAbsolutePath();
BundleContext bc = FrameworkUtil.getBundle(OsgiExecutionControlProvider.class).getBundleContext();
BundleContext bc = FrameworkUtil.getBundle(OsgiExecutionControlProvider.class).getBundleContext();
+ String framework = bc.getProperty("osgi.framework");
+ Path frameworkLocation = Paths.get(URI.create(framework)).toAbsolutePath();
Bundle fromBundle = bc.getBundle(bundleId);
BundleWiring fromBundleWiring = fromBundle.adapt(BundleWiring.class);
Bundle fromBundle = bc.getBundle(bundleId);
BundleWiring fromBundleWiring = fromBundle.adapt(BundleWiring.class);