From 2e5fa2b1ee93182565781bddc8e7f290d50a9a2f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 5 May 2024 18:53:08 +0200 Subject: [PATCH] Disable multi-runtime tests --- org.argeo.slc.runtime/bnd.bnd | 2 +- .../slc/internal/runtime/osgi/SlcInitActivator.java | 10 +++++----- sdk/slc-runtime.properties | 13 ++++++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/org.argeo.slc.runtime/bnd.bnd b/org.argeo.slc.runtime/bnd.bnd index 971fb5031..7f0421414 100644 --- a/org.argeo.slc.runtime/bnd.bnd +++ b/org.argeo.slc.runtime/bnd.bnd @@ -1,4 +1,4 @@ -Bundle-Activator: org.argeo.slc.internal.runtime.osgi.SlcInitActivator +#Bundle-Activator: org.argeo.slc.internal.runtime.osgi.SlcInitActivator Import-Package: \ org.argeo.api.slc.deploy,\ diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime/osgi/SlcInitActivator.java b/org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime/osgi/SlcInitActivator.java index d1490b43c..0169a030a 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime/osgi/SlcInitActivator.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime/osgi/SlcInitActivator.java @@ -43,13 +43,13 @@ public class SlcInitActivator implements BundleActivator { // return; // } -// runtimeManager.startRuntime("rcp/test1", (config) -> { -// config.put("osgi.console", "host1:2023"); + runtimeManager.startRuntime("rcp/test1", (config) -> { + config.put("osgi.console", "host1:2023"); + config.put("argeo.osgi.start.6", "org.argeo.swt.minidesktop"); // config.put(CmsDeployProperty.SSHD_PORT.getProperty(), "2222"); -//// config.put(CmsDeployProperty.HTTP_PORT.getProperty(), "7070"); +// config.put(CmsDeployProperty.HTTP_PORT.getProperty(), "7070"); // config.put(CmsDeployProperty.HOST.getProperty(), "host1"); -//// config.put("argeo.osgi.start.6", "org.argeo.swt.minidesktop"); -// }); + }); runtimeManager.startRuntime("rap/test2", (config) -> { config.put("osgi.console", "host2:2023"); diff --git a/sdk/slc-runtime.properties b/sdk/slc-runtime.properties index 908d5560c..7ec4263ce 100644 --- a/sdk/slc-runtime.properties +++ b/sdk/slc-runtime.properties @@ -1,3 +1,10 @@ -argeo.osgi.start.5=\ -org.argeo.init,\ -org.argeo.rt.cms,\ +argeo.osgi.start.2=\ +org.apache.felix.scr,\ +org.argeo.init + +argeo.osgi.start.3=\ +org.argeo.cms,\ +org.argeo.cms.jshell,\ + +#argeo.osgi.start.5=\ +#org.argeo.rt.cms,\ -- 2.30.2