X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2FOsgiRuntime.java;h=504f0cfa9e34446b8f9d40dad09890bf8337fd0c;hb=5a7871454f57064cf5fb2be810dc1f26f744629e;hp=bd6c63034a8ca28395b4eb2d7c0ef434149d11e4;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java
index bd6c63034..504f0cfa9 100644
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java
@@ -4,21 +4,25 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.argeo.slc.SlcException;
+import org.argeo.slc.StreamReadable;
 import org.argeo.slc.UnsupportedException;
 import org.argeo.slc.build.Distribution;
-import org.argeo.slc.core.deploy.ResourceDistribution;
+import org.argeo.slc.build.NameVersion;
+import org.argeo.slc.core.build.VersionedResourceDistribution;
 import org.argeo.slc.deploy.DeploymentData;
-import org.argeo.slc.deploy.ModularDeployedSystem;
+import org.argeo.slc.deploy.DynamicRuntime;
 import org.argeo.slc.deploy.TargetData;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.osgi.context.BundleContextAware;
 
-public class OsgiRuntime implements ModularDeployedSystem<OsgiBundle>,
-		BundleContextAware, ResourceLoaderAware {
+public class OsgiRuntime implements BundleContextAware, ResourceLoaderAware,
+		DynamicRuntime<OsgiBundle> {
 	private String uuid = UUID.randomUUID().toString();
 	private BundleContext bundleContext;
 	private ResourceLoader resourceLoader;
@@ -32,12 +36,65 @@ public class OsgiRuntime implements ModularDeployedSystem<OsgiBundle>,
 			String location = bundle.getLocation();
 			if (location != null) {
 				Resource resource = resourceLoader.getResource(location);
-				osgiBundle.setDistribution(new ResourceDistribution(resource));
+				osgiBundle
+						.setResourceDistribution(new VersionedResourceDistribution(
+								osgiBundle.getName(), osgiBundle.getVersion(),
+								resource));
 			}
 		}
 		return modules;
 	}
 
+	public OsgiBundle installModule(Distribution distribution) {
+		if (!(distribution instanceof StreamReadable))
+			throw new UnsupportedException("distribution", distribution);
+
+		StreamReadable sr = (StreamReadable) distribution;
+		Bundle bundle;
+		try {
+			bundle = bundleContext.installBundle(sr.toString(), sr
+					.getInputStream());
+		} catch (BundleException e) {
+			throw new SlcException(
+					"Cannot install OSGi bundle " + distribution, e);
+		}
+		return new OsgiBundle(bundle);
+	}
+
+	public void uninstallModule(NameVersion nameVersion) {
+		Bundle bundle = findBundle(nameVersion);
+		try {
+			bundle.uninstall();
+		} catch (BundleException e) {
+			throw new SlcException("Cannot uninstall " + bundle, e);
+		}
+	}
+
+	public void startModule(NameVersion nameVersion) {
+		Bundle bundle = findBundle(nameVersion);
+		try {
+			bundle.start();
+			// TODO: use bundle manager
+		} catch (BundleException e) {
+			throw new SlcException("Cannot uninstall " + bundle, e);
+		}
+	}
+
+	protected Bundle findBundle(NameVersion nameVersion) {
+		Bundle[] bundles = bundleContext.getBundles();
+		for (Bundle bundle : bundles) {
+			OsgiBundle osgiBundle = new OsgiBundle(bundle);
+			if (osgiBundle.equals(nameVersion)) {
+				return bundle;
+			}
+		}
+		throw new SlcException("Could not find bundle " + nameVersion);
+	}
+
+	public void shutdown() {
+		throw new UnsupportedException();
+	}
+
 	public String getDeployedSystemId() {
 		return uuid;
 	}