X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jshell%2Fsrc%2Forg%2Fargeo%2Finternal%2Fcms%2Fjshell%2Fosgi%2FOsgiExecutionControlProvider.java;h=4a8f1685f769b0d622373cff420362902dbea124;hb=5d7ebadd9fe583fd9d3b2e4ca6e99079b99aac5a;hp=fbca085861759a1410b743555d8eb1d817db6367;hpb=34c5b53472920a6fd7fa1ff98ca71319e64ad404;p=lgpl%2Fargeo-commons.git

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 fbca08586..4a8f1685f 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
@@ -22,6 +22,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.jshell.CmsExecutionControl;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.Version;
 import org.osgi.framework.namespace.PackageNamespace;
@@ -89,6 +90,25 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider {
 	public static Path getBundleStartupScript(Long bundleId) {
 		BundleContext bc = FrameworkUtil.getBundle(OsgiExecutionControlProvider.class).getBundleContext();
 		Bundle fromBundle = bc.getBundle(bundleId);
+
+		int bundleState = fromBundle.getState();
+		if (Bundle.INSTALLED == bundleState)
+			throw new IllegalStateException("Bundle " + fromBundle.getSymbolicName() + " is not resolved");
+		if (Bundle.RESOLVED == bundleState) {
+			try {
+				fromBundle.start();
+			} catch (BundleException e) {
+				throw new IllegalStateException("Cannot start bundle " + fromBundle.getSymbolicName(), e);
+			}
+			while (Bundle.ACTIVE != fromBundle.getState())
+				try {
+					Thread.sleep(100);
+				} catch (InterruptedException e) {
+					// we assume the session has been closed
+					throw new RuntimeException("Bundle " + fromBundle.getSymbolicName() + " is not active", e);
+				}
+		}
+
 		Path bundleStartupScript = fromBundle.getDataFile("BUNDLE.jsh").toPath();
 
 		BundleWiring fromBundleWiring = fromBundle.adapt(BundleWiring.class);
@@ -101,8 +121,13 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider {
 			packagesToImport.add(pkg.getName());
 		}
 
-		List<BundleWire> bundleWires = fromBundleWiring.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
-		for (BundleWire bw : bundleWires) {
+//		List<BundleWire> exportedWires = fromBundleWiring.getProvidedWires(BundleRevision.PACKAGE_NAMESPACE);
+//		for (BundleWire bw : exportedWires) {
+//			packagesToImport.add(bw.getCapability().getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE).toString());
+//		}
+
+		List<BundleWire> importedWires = fromBundleWiring.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
+		for (BundleWire bw : importedWires) {
 			packagesToImport.add(bw.getCapability().getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE).toString());
 		}