X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.cms%2Fsrc%2Forg%2Fargeo%2Fslc%2Finit%2Fosgi%2FSlcInitActivator.java;h=542aac91c99867bf280f6be8c4fb2808e839d3a1;hb=82fcb6324dc57a36a8c9c4f4b0e564a1f4ef97de;hp=e8b43e75052575a0ce374db8375109435c7f330c;hpb=6386ebcc28ff6a6da29544797bf4c278f4faf237;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.cms/src/org/argeo/slc/init/osgi/SlcInitActivator.java b/org.argeo.slc.cms/src/org/argeo/slc/init/osgi/SlcInitActivator.java
index e8b43e750..542aac91c 100644
--- a/org.argeo.slc.cms/src/org/argeo/slc/init/osgi/SlcInitActivator.java
+++ b/org.argeo.slc.cms/src/org/argeo/slc/init/osgi/SlcInitActivator.java
@@ -4,9 +4,8 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.argeo.api.cms.CmsLog;
+import org.argeo.api.init.RuntimeManager;
 import org.argeo.cms.CmsDeployProperty;
-import org.argeo.init.RuntimeManager;
-import org.argeo.init.osgi.OsgiBoot;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -20,7 +19,22 @@ public class SlcInitActivator implements BundleActivator {
 	@Override
 	public void start(BundleContext context) throws Exception {
 		Path userHome = Paths.get(System.getProperty("user.home"));
-//		OsgiCmsDeployment.main(new String[0]);
+
+//		{
+//			EquinoxFactory equinoxFactory = new EquinoxFactory();
+//			Map<String, String> config = new HashMap<>();
+//			config.put("osgi.console", "host1:2023");
+//			config.put("osgi.frameworkParentClassloader", "app");
+//			config.put("osgi.parentClassLoader", "app");
+//			RuntimeManager.loadConfig(Paths.get("/usr/local/etc/argeo/user/cms/test3"), config);
+//			Framework framework = equinoxFactory.newFramework(config);
+//			framework.start();
+//			OsgiBoot osgiBoot = new OsgiBoot(framework.getBundleContext());
+//			osgiBoot.bootstrap(config);
+//		}
+
+		// OsgiCmsDeployment.test();
+
 		runtimeManagerSt = new ServiceTracker<>(context, RuntimeManager.class, null) {
 
 			@Override
@@ -29,29 +43,33 @@ public class SlcInitActivator implements BundleActivator {
 				log.debug("Found runtime manager " + runtimeManager);
 				new Thread() {
 					public void run() {
-						try {
-							Thread.sleep(5000);
-						} catch (InterruptedException e) {
-							return;
-						}
+//						try {
+//							Thread.sleep(5000);
+//						} catch (InterruptedException e) {
+//							return;
+//						}
 
-						runtimeManager.startRuntime("cms/test", (config) -> {
-							config.put("osgi.clean", "true");
-							// config.put("argeo.osgi.sources", "a2+reference:///?osgi=equinox");
-							config.put("osgi.console", "2024");
+						runtimeManager.startRuntime("native/test1", (config) -> {
+							config.put("osgi.console", "host1:2023");
 							config.put(CmsDeployProperty.SSHD_PORT.getProperty(), "2222");
-//							config.put(CmsDeployProperty.HTTP_PORT.getProperty(), "7070");
-//							config.put(CmsDeployProperty.HOST.getProperty(),
-//									"localhost");
-							Path instanceData = userHome
-									.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment/data");
-							config.put(OsgiBoot.PROP_OSGI_INSTANCE_AREA, instanceData.toUri().toString());
-							config.put("argeo.directory", "dc=example,dc=com.ldif");
-
+							config.put(CmsDeployProperty.HTTP_PORT.getProperty(), "7070");
+							config.put(CmsDeployProperty.HOST.getProperty(), "host1");
 //							for (String key : config.keySet()) {
 //								System.out.println(key + "=" + config.get(key));
 ////								log.debug(() -> key + "=" + config.get(key));
 //							}
+//							config.put("argeo.osgi.start.6", "org.argeo.swt.minidesktop");
+						});
+						runtimeManager.startRuntime("native/test2", (config) -> {
+							config.put("osgi.console", "host2:2023");
+							config.put(CmsDeployProperty.SSHD_PORT.getProperty(), "2222");
+							// config.put(CmsDeployProperty.HTTP_PORT.getProperty(), "7070");
+							config.put(CmsDeployProperty.HOST.getProperty(), "host2");
+//							config.put("argeo.osgi.start.6", "org.argeo.swt.minidesktop");
+////							config.put("argeo.directory", "ipa:///");
+//							Path instanceData = userHome
+//									.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment/data");
+//							config.put(InitConstants.PROP_OSGI_INSTANCE_AREA, instanceData.toUri().toString());
 						});
 					}
 				}.start();
@@ -60,7 +78,7 @@ public class SlcInitActivator implements BundleActivator {
 			}
 
 		};
-		runtimeManagerSt.open(true);
+		runtimeManagerSt.open(false);
 	}
 
 	@Override