From: Mathieu Baudier Date: Thu, 29 Feb 2024 18:45:21 +0000 (+0100) Subject: Adapt OSGi deployment to changes in Argeo CMS X-Git-Tag: v2.3.15~14 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-slc.git;a=commitdiff_plain;h=753604c3ba7481e4bdf1e87f1ffc5e0eec9b18ba Adapt OSGi deployment to changes in Argeo CMS --- diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java deleted file mode 100644 index 8de43540a..000000000 --- a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.argeo.slc.cms.deploy.osgi; - -import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.ModularDistribution; -import org.argeo.slc.cms.deploy.CmsDeployedSystem; -import org.argeo.slc.cms.deploy.CmsDeploymentData; -import org.argeo.slc.cms.deploy.CmsTargetData; -import org.argeo.slc.deploy.DeploymentData; -import org.argeo.slc.deploy.TargetData; -import org.osgi.framework.BundleContext; - -public class CmsOsgiDeployedSystem implements CmsDeployedSystem { - private ModularDistribution distribution; - private CmsTargetData targetData; - private CmsDeploymentData deploymentData; - - private BundleContext systemBundleContext; - - public CmsOsgiDeployedSystem(BundleContext systemBundleContext, ModularDistribution distribution, - CmsTargetData targetData, CmsDeploymentData deploymentData) { - this.systemBundleContext = systemBundleContext; - - this.distribution = distribution; - this.targetData = targetData; - this.deploymentData = deploymentData; - } - - @Override - public String getDeployedSystemId() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Distribution getDistribution() { - return distribution; - } - - @Override - public DeploymentData getDeploymentData() { - return deploymentData; - } - - @Override - public TargetData getTargetData() { - return targetData; - } - -} diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java deleted file mode 100644 index 4c9ea2018..000000000 --- a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java +++ /dev/null @@ -1,193 +0,0 @@ -package org.argeo.slc.cms.deploy.osgi; - -import java.io.IOException; -import java.lang.System.Logger; -import java.lang.System.Logger.Level; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringJoiner; -import java.util.TreeMap; - -import org.argeo.cms.CmsDeployProperty; -import org.argeo.init.a2.A2Source; -import org.argeo.init.a2.FsA2Source; -import org.argeo.init.osgi.OsgiBoot; -import org.argeo.init.osgi.OsgiRuntimeContext; -import org.argeo.slc.WellKnownConstants; -import org.argeo.slc.build.Distribution; -import org.argeo.slc.cms.deploy.CmsDeployedSystem; -import org.argeo.slc.cms.deploy.CmsDeploymentData; -import org.argeo.slc.cms.deploy.CmsTargetData; -import org.argeo.slc.cms.deploy.SimpleCmsDeploymentData; -import org.argeo.slc.cms.deploy.SimpleCmsTargetData; -import org.argeo.slc.cms.distribution.A2Distribution; -import org.argeo.slc.deploy.DeployedSystem; -import org.argeo.slc.deploy.Deployment; -import org.argeo.slc.deploy.DeploymentData; -import org.argeo.slc.deploy.TargetData; - -public class CmsOsgiDeployment implements Deployment { - private final static Logger logger = System.getLogger(CmsOsgiDeployment.class.getName()); - - private A2Distribution distribution; - private CmsTargetData targetData; - private CmsDeploymentData deploymentData; - - private CmsDeployedSystem deployedSystem; - - private OsgiRuntimeContext runtimeContext; - - @Override - public void run() { - try { - Map config = new TreeMap<>(); - - // sources - StringJoiner sourcesProperty = new StringJoiner(","); - for (A2Source a2Source : distribution.getA2Sources()) { - sourcesProperty.add(a2Source.getUri().toString()); - } - config.put(OsgiBoot.PROP_ARGEO_OSGI_SOURCES, sourcesProperty.toString()); - - // target - config.put(WellKnownConstants.OSGI_INSTANCE_AREA, - targetData.getInstanceData().toRealPath().toUri().toString()); - if (targetData.getHttpPort() != null) { - config.put(CmsDeployProperty.HTTP_PORT.getProperty(), targetData.getHttpPort().toString()); - } - - Path configurationArea = Files.createTempDirectory("slc-cms-test"); - config.put(WellKnownConstants.OSGI_CONFIGURATION_AREA, configurationArea.toUri().toString()); - - // modules activation - for (int startLevel = 0; startLevel <= 6; startLevel++) { - List modules = deploymentData.getModulesToActivate(startLevel); - if (modules.size() != 0) { - String startProperty = String.join(",", modules); - config.put(OsgiBoot.PROP_ARGEO_OSGI_START + "." + startLevel, startProperty); - } - } - - config.put("org.eclipse.equinox.http.jetty.autostart", "false"); - config.put("org.osgi.framework.bootdelegation", - "com.sun.jndi.ldap,com.sun.jndi.ldap.sasl,com.sun.security.jgss,com.sun.jndi.dns,com.sun.nio.file,com.sun.nio.sctp"); - config.put("eclipse.ignoreApp", "true"); - config.put("osgi.noShutdown", "true"); - - config.put("osgi.console", "2323"); - - // initialise - for (String key : config.keySet()) { -// System.out.println(key + "=" + config.get(key)); - logger.log(Level.INFO, () -> key + "=" + config.get(key)); - } - - runtimeContext = new OsgiRuntimeContext(config); - runtimeContext.run(); - - deployedSystem = new CmsOsgiDeployedSystem(runtimeContext.getFramework().getBundleContext(), distribution, - targetData, deploymentData); - - } catch (Exception e) { - throw new IllegalStateException("Cannot run OSGi deployment", e); - } - - } - - @Override - public DeployedSystem getDeployedSystem() { - return deployedSystem; - } - - @Override - public void setTargetData(TargetData targetData) { - this.targetData = (CmsTargetData) targetData; - } - - @Override - public void setDeploymentData(DeploymentData deploymentData) { - this.deploymentData = (CmsDeploymentData) deploymentData; - } - - @Override - public void setDistribution(Distribution distribution) { - this.distribution = (A2Distribution) distribution; - } - - public OsgiRuntimeContext getRuntimeContext() { - return runtimeContext; - } - - public static void main(String[] args) { - try { - Path userHome = Paths.get(System.getProperty("user.home")); - - // distribution - Path a2Base = userHome.resolve("dev/git/unstable/output/a2"); - A2Distribution distribution = new A2Distribution(); - Map xOr = new HashMap<>(); - xOr.put("osgi", "equinox"); - xOr.put("swt", "rap"); - distribution.getA2Sources().add(new FsA2Source(a2Base, xOr, true)); - - // target data - Path instanceData = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment/data"); - Files.createDirectories(instanceData); - Integer httpPort = 7070; - SimpleCmsTargetData targetData = new SimpleCmsTargetData(instanceData, httpPort); - - // deployment data - SimpleCmsDeploymentData deploymentData = new SimpleCmsDeploymentData(); - deploymentData.getModulesToActivate(2).add("org.eclipse.equinox.http.servlet"); - deploymentData.getModulesToActivate(2).add("org.apache.felix.scr"); - deploymentData.getModulesToActivate(2).add("org.eclipse.rap.rwt.osgi"); - deploymentData.getModulesToActivate(2).add("org.eclipse.equinox.console"); - - deploymentData.getModulesToActivate(3).add("org.argeo.cms"); - deploymentData.getModulesToActivate(3).add("org.argeo.cms.ee"); - deploymentData.getModulesToActivate(3).add("org.argeo.cms.lib.sshd"); - deploymentData.getModulesToActivate(3).add("org.argeo.cms.lib.equinox"); - deploymentData.getModulesToActivate(3).add("org.argeo.cms.lib.jetty"); - deploymentData.getModulesToActivate(3).add("org.argeo.cms.swt.rap"); - - deploymentData.getModulesToActivate(4).add("org.argeo.cms.jcr"); - deploymentData.getModulesToActivate(4).add("org.argeo.app.profile.acr.fs"); - - deploymentData.getModulesToActivate(5).add("org.argeo.app.core"); - deploymentData.getModulesToActivate(5).add("org.argeo.app.ui"); - deploymentData.getModulesToActivate(5).add("org.argeo.app.theme.default"); - - CmsOsgiDeployment deployment = new CmsOsgiDeployment(); - deployment.setDistribution(distribution); - deployment.setTargetData(targetData); - deployment.setDeploymentData(deploymentData); - deployment.run(); - - boolean multiple = false; - if (multiple) { - - Path instanceData2 = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment2/data"); - Files.createDirectories(instanceData2); - Integer httpPort2 = 7071; - SimpleCmsTargetData targetData2 = new SimpleCmsTargetData(instanceData2, httpPort2); - - CmsOsgiDeployment deployment2 = new CmsOsgiDeployment(); - deployment2.setDistribution(distribution); - deployment2.setTargetData(targetData2); - deployment2.setDeploymentData(deploymentData); - deployment2.run(); - } - - deployment.getRuntimeContext().waitForStop(0); - - } catch (IOException | InterruptedException e) { - e.printStackTrace(); - System.exit(1); - } - } - -} diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java new file mode 100644 index 000000000..c925a544b --- /dev/null +++ b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java @@ -0,0 +1,50 @@ +package org.argeo.slc.cms.deploy.osgi; + +import org.argeo.slc.build.Distribution; +import org.argeo.slc.build.ModularDistribution; +import org.argeo.slc.cms.deploy.CmsDeployedSystem; +import org.argeo.slc.cms.deploy.CmsDeploymentData; +import org.argeo.slc.cms.deploy.CmsTargetData; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; +import org.osgi.framework.BundleContext; + +/** A deployed OSGi-based Argeo CMS system. */ +public class OsgiCmsDeployedSystem implements CmsDeployedSystem { + private ModularDistribution distribution; + private CmsTargetData targetData; + private CmsDeploymentData deploymentData; + + private BundleContext systemBundleContext; + + public OsgiCmsDeployedSystem(BundleContext systemBundleContext, ModularDistribution distribution, + CmsTargetData targetData, CmsDeploymentData deploymentData) { + this.systemBundleContext = systemBundleContext; + + this.distribution = distribution; + this.targetData = targetData; + this.deploymentData = deploymentData; + } + + @Override + public String getDeployedSystemId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Distribution getDistribution() { + return distribution; + } + + @Override + public DeploymentData getDeploymentData() { + return deploymentData; + } + + @Override + public TargetData getTargetData() { + return targetData; + } + +} diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java new file mode 100644 index 000000000..91aba2945 --- /dev/null +++ b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java @@ -0,0 +1,204 @@ +package org.argeo.slc.cms.deploy.osgi; + +import java.io.IOException; +import java.lang.System.Logger; +import java.lang.System.Logger.Level; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringJoiner; +import java.util.TreeMap; + +import org.argeo.cms.CmsDeployProperty; +import org.argeo.init.a2.A2Source; +import org.argeo.init.a2.FsA2Source; +import org.argeo.init.osgi.OsgiBoot; +import org.argeo.init.osgi.OsgiRuntimeContext; +import org.argeo.slc.WellKnownConstants; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.cms.deploy.CmsDeployedSystem; +import org.argeo.slc.cms.deploy.CmsDeploymentData; +import org.argeo.slc.cms.deploy.CmsTargetData; +import org.argeo.slc.cms.deploy.SimpleCmsDeploymentData; +import org.argeo.slc.cms.distribution.A2Distribution; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.deploy.Deployment; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; + +/** The process of deploying an OSGi based Argeo CMS system. */ +public class OsgiCmsDeployment implements Deployment { + private final static Logger logger = System.getLogger(OsgiCmsDeployment.class.getName()); + + private A2Distribution distribution; + private CmsTargetData targetData; + private CmsDeploymentData deploymentData; + + private CmsDeployedSystem deployedSystem; + + private OsgiRuntimeContext runtimeContext; + + @Override + public void run() { + try { + Map config = new TreeMap<>(); + + // sources + StringJoiner sourcesProperty = new StringJoiner(","); + for (A2Source a2Source : distribution.getA2Sources()) { + sourcesProperty.add(a2Source.getUri().toString()); + } + config.put(OsgiBoot.PROP_ARGEO_OSGI_SOURCES, sourcesProperty.toString()); + + // target + config.put(WellKnownConstants.OSGI_INSTANCE_AREA, + targetData.getInstanceData().toRealPath().toUri().toString()); + if (targetData.getHttpPort() != null) { + config.put(CmsDeployProperty.HTTP_PORT.getProperty(), targetData.getHttpPort().toString()); + } + + Path configurationArea = Files.createTempDirectory("slc-cms-test"); + config.put(WellKnownConstants.OSGI_CONFIGURATION_AREA, configurationArea.toUri().toString()); + + // modules activation + for (int startLevel = 0; startLevel <= 6; startLevel++) { + List modules = deploymentData.getModulesToActivate(startLevel); + if (modules.size() != 0) { + String startProperty = String.join(",", modules); + config.put(OsgiBoot.PROP_ARGEO_OSGI_START + "." + startLevel, startProperty); + } + } + + config.put("org.eclipse.equinox.http.jetty.autostart", "false"); + config.put("org.osgi.framework.system.packages.extra", + "sun.security.util,sun.security.internal.spec,sun.security.provider,com.sun.net.httpserver,com.sun.jndi.ldap,com.sun.jndi.ldap.sasl,com.sun.jndi.dns,com.sun.security.jgss,com.sun.nio.file,com.sun.nio.sctp"); + config.put("eclipse.ignoreApp", "true"); + config.put("osgi.noShutdown", "true"); + + config.put("argeo.directory", "dc=example,dc=com.ldif"); + + if (targetData instanceof OsgiCmsTargetData osgiCmsTargetData && osgiCmsTargetData.getTelnetPort() != null) + config.put("osgi.console", osgiCmsTargetData.getTelnetPort().toString()); + + // initialise + for (String key : config.keySet()) { +// System.out.println(key + "=" + config.get(key)); + logger.log(Level.TRACE, () -> key + "=" + config.get(key)); + } + + runtimeContext = new OsgiRuntimeContext(config); + runtimeContext.run(); + + deployedSystem = new OsgiCmsDeployedSystem(runtimeContext.getFramework().getBundleContext(), distribution, + targetData, deploymentData); + + } catch (Exception e) { + throw new IllegalStateException("Cannot run OSGi deployment", e); + } + + } + + @Override + public DeployedSystem getDeployedSystem() { + return deployedSystem; + } + + @Override + public void setTargetData(TargetData targetData) { + this.targetData = (CmsTargetData) targetData; + } + + @Override + public void setDeploymentData(DeploymentData deploymentData) { + this.deploymentData = (CmsDeploymentData) deploymentData; + } + + @Override + public void setDistribution(Distribution distribution) { + this.distribution = (A2Distribution) distribution; + } + + public OsgiRuntimeContext getRuntimeContext() { + return runtimeContext; + } + + public static void main(String[] args) { + try { + Path userHome = Paths.get(System.getProperty("user.home")); + + // distribution + Path a2Base = userHome.resolve("dev/git/unstable/output/a2"); + A2Distribution distribution = new A2Distribution(); + Map xOr = new HashMap<>(); + xOr.put("osgi", "equinox"); + xOr.put("swt", "rap"); + xOr.put("log", "syslogger"); + xOr.put("crypto", "fips"); + distribution.getA2Sources().add(new FsA2Source(a2Base, xOr, true)); + + // target data + Path instanceData = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment/data"); + Files.createDirectories(instanceData); + OsgiCmsTargetData targetData = new OsgiCmsTargetData(instanceData, 7070, 2323); + + // deployment data + SimpleCmsDeploymentData deploymentData = new SimpleCmsDeploymentData(); + deploymentData.getModulesToActivate(2).add("org.eclipse.equinox.http.servlet"); + deploymentData.getModulesToActivate(2).add("org.apache.felix.scr"); + deploymentData.getModulesToActivate(2).add("org.eclipse.rap.rwt.osgi"); + deploymentData.getModulesToActivate(2).add("org.eclipse.equinox.console"); + + deploymentData.getModulesToActivate(3).add("org.argeo.cms"); + deploymentData.getModulesToActivate(3).add("org.argeo.cms.ee"); + deploymentData.getModulesToActivate(3).add("org.argeo.cms.lib.sshd"); + deploymentData.getModulesToActivate(3).add("org.argeo.cms.lib.equinox"); + deploymentData.getModulesToActivate(3).add("org.argeo.cms.lib.jetty"); + deploymentData.getModulesToActivate(3).add("org.argeo.cms.swt.rap"); + + deploymentData.getModulesToActivate(4).add("org.argeo.cms.jcr"); + deploymentData.getModulesToActivate(4).add("org.argeo.app.profile.acr.fs"); + + deploymentData.getModulesToActivate(5).add("org.argeo.app.core"); + deploymentData.getModulesToActivate(5).add("org.argeo.app.ui"); + deploymentData.getModulesToActivate(5).add("org.argeo.app.theme.default"); + deploymentData.getModulesToActivate(5).add("org.argeo.app.jcr"); + + deploymentData.getModulesToActivate(5).add("org.example.suite.theme"); + deploymentData.getModulesToActivate(5).add("org.example.suite.core"); + deploymentData.getModulesToActivate(5).add("org.example.suite.ui"); + deploymentData.getModulesToActivate(5).add("org.example.suite.ui.rap"); + + OsgiCmsDeployment deployment = new OsgiCmsDeployment(); + deployment.setDistribution(distribution); + deployment.setTargetData(targetData); + deployment.setDeploymentData(deploymentData); + deployment.run(); + + boolean multiple = true; + if (multiple) { + // wait a bit + Thread.sleep(5000); + + Path instanceData2 = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment2/data"); + Files.createDirectories(instanceData2); + OsgiCmsTargetData targetData2 = new OsgiCmsTargetData(instanceData2, 7071, 2324); + + OsgiCmsDeployment deployment2 = new OsgiCmsDeployment(); + deployment2.setDistribution(distribution); + deployment2.setTargetData(targetData2); + deployment2.setDeploymentData(deploymentData); + deployment2.run(); + } + + // deployment.getRuntimeContext().waitForStop(0); + + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + System.exit(1); + } + } + +} diff --git a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java new file mode 100644 index 000000000..9edc5247c --- /dev/null +++ b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsTargetData.java @@ -0,0 +1,23 @@ +package org.argeo.slc.cms.deploy.osgi; + +import java.nio.file.Path; + +import org.argeo.slc.cms.deploy.SimpleCmsTargetData; + +public class OsgiCmsTargetData extends SimpleCmsTargetData { + private Integer telnetPort; + + public OsgiCmsTargetData(Path instanceData, Integer httpPort, Integer telnetPort) { + super(instanceData, httpPort); + this.telnetPort = telnetPort; + } + + public Integer getTelnetPort() { + return telnetPort; + } + + public void setTelnetPort(Integer telnetPort) { + this.telnetPort = telnetPort; + } + +}