From 67ac344052752622d4bd3e59c4f88c2bc9f6d3b6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 7 Mar 2024 19:45:49 +0100 Subject: [PATCH] Move SLC Init activator to SLC Runtime --- org.argeo.slc.cms/bnd.bnd | 2 - org.argeo.slc.cms/build.properties | 1 - org.argeo.slc.runtime/bnd.bnd | 2 + .../slc/cms/deploy/CmsDeployedSystem.java | 0 .../slc/cms/deploy/CmsDeploymentData.java | 0 .../argeo/slc/cms/deploy/CmsTargetData.java | 0 .../cms/deploy/SimpleCmsDeploymentData.java | 0 .../slc/cms/deploy/SimpleCmsTargetData.java | 0 .../deploy/osgi/OsgiCmsDeployedSystem.java | 0 .../cms/deploy/osgi/OsgiCmsDeployment.java | 5 +- .../cms/deploy/osgi/OsgiCmsTargetData.java | 0 .../slc/cms/distribution/A2Distribution.java | 0 .../distribution/A2ModuleDistribution.java | 0 .../org/argeo/slc/cms/test/CmsSmokeTest.java | 0 .../org/argeo/slc/cms/test/MinimalJvm.java | 0 .../runtime}/osgi/SlcInitActivator.java | 47 ++++++++----------- 16 files changed, 23 insertions(+), 34 deletions(-) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/CmsTargetData.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java (97%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/distribution/A2Distribution.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/test/CmsSmokeTest.java (100%) rename {org.argeo.slc.cms => org.argeo.slc.runtime}/src/org/argeo/slc/cms/test/MinimalJvm.java (100%) rename {org.argeo.slc.cms/src/org/argeo/slc/init => org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime}/osgi/SlcInitActivator.java (53%) diff --git a/org.argeo.slc.cms/bnd.bnd b/org.argeo.slc.cms/bnd.bnd index 737ccf8cd..5decbd1fc 100644 --- a/org.argeo.slc.cms/bnd.bnd +++ b/org.argeo.slc.cms/bnd.bnd @@ -1,6 +1,4 @@ -Bundle-Activator: org.argeo.slc.init.osgi.SlcInitActivator - Import-Package: \ org.apache.commons.logging,\ org.postgresql;version="[42,43)";resolution:=optional,\ diff --git a/org.argeo.slc.cms/build.properties b/org.argeo.slc.cms/build.properties index 5d082eaf6..34d2e4d2d 100644 --- a/org.argeo.slc.cms/build.properties +++ b/org.argeo.slc.cms/build.properties @@ -2,4 +2,3 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -additional.bundles = org.argeo.init diff --git a/org.argeo.slc.runtime/bnd.bnd b/org.argeo.slc.runtime/bnd.bnd index 6956a159b..263e792e0 100644 --- a/org.argeo.slc.runtime/bnd.bnd +++ b/org.argeo.slc.runtime/bnd.bnd @@ -1,3 +1,5 @@ +Bundle-Activator: org.argeo.slc.internal.runtime.osgi.SlcInitActivator + Import-Package: \ org.argeo.slc.deploy,\ org.apache.commons.exec.*;resolution:=optional,\ diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsTargetData.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsTargetData.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsTargetData.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsTargetData.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java similarity index 97% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java index 1c472e70f..f6e55caef 100644 --- a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java @@ -16,7 +16,6 @@ import org.argeo.api.a2.A2Source; import org.argeo.api.a2.FsA2Source; import org.argeo.api.init.InitConstants; import org.argeo.api.init.RuntimeContext; -import org.argeo.cms.CmsDeployProperty; import org.argeo.init.osgi.OsgiRuntimeContext; import org.argeo.slc.WellKnownConstants; import org.argeo.slc.build.Distribution; @@ -59,11 +58,11 @@ public class OsgiCmsDeployment implements Deployment { targetData.getInstanceData().toRealPath().toUri().toString()); if (targetData.getHost() != null) { - config.put(CmsDeployProperty.HOST.getProperty(), targetData.getHost().toString()); + config.put("argeo.host", targetData.getHost().toString()); } if (targetData.getHttpPort() != null) { - config.put(CmsDeployProperty.HTTP_PORT.getProperty(), targetData.getHttpPort().toString()); + config.put("argeo.http.port", targetData.getHttpPort().toString()); } Path configurationArea = Files.createTempDirectory("slc-cms-test"); diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2Distribution.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2Distribution.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2Distribution.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2Distribution.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/test/CmsSmokeTest.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/test/CmsSmokeTest.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/test/MinimalJvm.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/test/MinimalJvm.java similarity index 100% rename from org.argeo.slc.cms/src/org/argeo/slc/cms/test/MinimalJvm.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cms/test/MinimalJvm.java diff --git a/org.argeo.slc.cms/src/org/argeo/slc/init/osgi/SlcInitActivator.java b/org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime/osgi/SlcInitActivator.java similarity index 53% rename from org.argeo.slc.cms/src/org/argeo/slc/init/osgi/SlcInitActivator.java rename to org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime/osgi/SlcInitActivator.java index 542aac91c..547cda11b 100644 --- a/org.argeo.slc.cms/src/org/argeo/slc/init/osgi/SlcInitActivator.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/internal/runtime/osgi/SlcInitActivator.java @@ -1,24 +1,19 @@ -package org.argeo.slc.init.osgi; +package org.argeo.slc.internal.runtime.osgi; -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.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; public class SlcInitActivator implements BundleActivator { - private final static CmsLog log = CmsLog.getLog(SlcInitActivator.class); +// private final static CmsLog log = CmsLog.getLog(SlcInitActivator.class); private ServiceTracker runtimeManagerSt; @Override public void start(BundleContext context) throws Exception { - Path userHome = Paths.get(System.getProperty("user.home")); +// Path userHome = Paths.get(System.getProperty("user.home")); // { // EquinoxFactory equinoxFactory = new EquinoxFactory(); @@ -40,7 +35,6 @@ public class SlcInitActivator implements BundleActivator { @Override public RuntimeManager addingService(ServiceReference reference) { RuntimeManager runtimeManager = super.addingService(reference); - log.debug("Found runtime manager " + runtimeManager); new Thread() { public void run() { // try { @@ -49,27 +43,24 @@ public class SlcInitActivator implements BundleActivator { // return; // } - 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(), "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) -> { +// runtimeManager.startRuntime("rcp/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(), "host1"); +//// config.put("argeo.osgi.start.6", "org.argeo.swt.minidesktop"); +// }); + + runtimeManager.startRuntime("rap/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.sshd.port", "2222"); + config.put("argeo.http.port", "7070"); + config.put("argeo.host", "host2"); + String a2Source = config.get("argeo.osgi.sources"); + config.put("argeo.osgi.sources", a2Source + + ",a2+reference:///home/mbaudier/dev/git/unstable/output/a2?include=eu.netiket.on.apaf"); + config.put("argeo.osgi.start.6", "eu.netiket.on.apaf"); //// 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(); -- 2.30.2