Refactor Argeo init

[gpl/argeo-slc.git] / org.argeo.slc.cms / src / org / argeo / slc / cms / deploy / osgi / OsgiCmsDeployment.java

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
index 91aba29459a8b7cd652f0f1bed05d966fb624ab0..77d72faf74d564e23106bc364b91becac1a08bec 100644 (file)
--- 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
@@ -12,11 +12,10 @@ import java.util.Map;
 import java.util.StringJoiner;
 import java.util.TreeMap;
 
+import org.argeo.api.a2.A2Source;
+import org.argeo.api.a2.FsA2Source;
+import org.argeo.api.init.InitConstants;
 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;
@@ -39,8 +38,6 @@ public class OsgiCmsDeployment implements Deployment {
 
        private CmsDeployedSystem deployedSystem;
 
-       private OsgiRuntimeContext runtimeContext;
-
        @Override
        public void run() {
                try {
@@ -51,11 +48,16 @@ public class OsgiCmsDeployment implements Deployment {
                        for (A2Source a2Source : distribution.getA2Sources()) {
                                sourcesProperty.add(a2Source.getUri().toString());
                        }
-                       config.put(OsgiBoot.PROP_ARGEO_OSGI_SOURCES, sourcesProperty.toString());
+                       config.put(InitConstants.PROP_ARGEO_OSGI_SOURCES, sourcesProperty.toString());
 
                        // target
                        config.put(WellKnownConstants.OSGI_INSTANCE_AREA,
                                        targetData.getInstanceData().toRealPath().toUri().toString());
+
+                       if (targetData.getHost() != null) {
+                               config.put(CmsDeployProperty.HOST.getProperty(), targetData.getHost().toString());
+                       }
+
                        if (targetData.getHttpPort() != null) {
                                config.put(CmsDeployProperty.HTTP_PORT.getProperty(), targetData.getHttpPort().toString());
                        }
@@ -68,7 +70,7 @@ public class OsgiCmsDeployment implements Deployment {
                                List<String> modules = deploymentData.getModulesToActivate(startLevel);
                                if (modules.size() != 0) {
                                        String startProperty = String.join(",", modules);
-                                       config.put(OsgiBoot.PROP_ARGEO_OSGI_START + "." + startLevel, startProperty);
+                                       config.put(InitConstants.PROP_ARGEO_OSGI_START + "." + startLevel, startProperty);
                                }
                        }
 
@@ -77,11 +79,19 @@ public class OsgiCmsDeployment implements Deployment {
                                        "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("osgi.clean", "true");
+                       config.put("osgi.framework.useSystemProperties", "false");
+
                        config.put("argeo.directory", "dc=example,dc=com.ldif");
 
-                       if (targetData instanceof OsgiCmsTargetData osgiCmsTargetData && osgiCmsTargetData.getTelnetPort() != null)
-                               config.put("osgi.console", osgiCmsTargetData.getTelnetPort().toString());
+                       if (targetData instanceof OsgiCmsTargetData osgiCmsTargetData
+                                       && osgiCmsTargetData.getTelnetPort() != null) {
+                               String hostStr = "";
+                               if (targetData.getHost() != null) {
+                                       hostStr = targetData.getHost().toString() + ":";
+                               }
+                               config.put("osgi.console", hostStr + osgiCmsTargetData.getTelnetPort().toString());
+                       }
 
                        // initialise
                        for (String key : config.keySet()) {
@@ -89,11 +99,12 @@ public class OsgiCmsDeployment implements Deployment {
                                logger.log(Level.TRACE, () -> key + "=" + config.get(key));
                        }
 
-                       runtimeContext = new OsgiRuntimeContext(config);
-                       runtimeContext.run();
+                       // FIXME use runtime manager
+//                     runtimeContext = new OsgiRuntimeContext(config);
+//                     runtimeContext.run();
 
-                       deployedSystem = new OsgiCmsDeployedSystem(runtimeContext.getFramework().getBundleContext(), distribution,
-                                       targetData, deploymentData);
+//                     deployedSystem = new OsgiCmsDeployedSystem(runtimeContext.getFramework().getBundleContext(), distribution,
+//                                     targetData, deploymentData);
 
                } catch (Exception e) {
                        throw new IllegalStateException("Cannot run OSGi deployment", e);
@@ -121,10 +132,6 @@ public class OsgiCmsDeployment implements Deployment {
                this.distribution = (A2Distribution) distribution;
        }
 
-       public OsgiRuntimeContext getRuntimeContext() {
-               return runtimeContext;
-       }
-
        public static void main(String[] args) {
                try {
                        Path userHome = Paths.get(System.getProperty("user.home"));
@@ -137,12 +144,12 @@ public class OsgiCmsDeployment implements Deployment {
                        xOr.put("swt", "rap");
                        xOr.put("log", "syslogger");
                        xOr.put("crypto", "fips");
-                       distribution.getA2Sources().add(new FsA2Source(a2Base, xOr, true));
+                       distribution.getA2Sources().add(new FsA2Source(a2Base, xOr, true, null, null));
 
                        // 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);
+                       OsgiCmsTargetData targetData = new OsgiCmsTargetData(instanceData, "host1", 7070, 2323);
 
                        // deployment data
                        SimpleCmsDeploymentData deploymentData = new SimpleCmsDeploymentData();
@@ -184,7 +191,7 @@ public class OsgiCmsDeployment implements Deployment {
 
                                Path instanceData2 = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment2/data");
                                Files.createDirectories(instanceData2);
-                               OsgiCmsTargetData targetData2 = new OsgiCmsTargetData(instanceData2, 7071, 2324);
+                               OsgiCmsTargetData targetData2 = new OsgiCmsTargetData(instanceData2, "host2", 7070, 2323);
 
                                OsgiCmsDeployment deployment2 = new OsgiCmsDeployment();
                                deployment2.setDistribution(distribution);