From 957ae3fb3d304078cf272b8e99bf067c6a310540 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 7 Mar 2024 19:05:21 +0100 Subject: [PATCH] Improve mutli-runtime deployment --- etc/argeo/user/argeo.ini | 20 ++++---------- etc/argeo/user/{cms => rap}/cms.ini | 13 ++++++++- etc/argeo/user/{cms => rap}/debug.ini | 0 .../user/{slc/argeo.ini => rap/packages.ini} | 14 +++++----- etc/argeo/user/{native => rcp}/cms.ini | 3 ++- etc/argeo/user/{native => rcp}/debug.ini | 0 etc/argeo/user/rcp/packages.ini | 27 +++++++++++++++++++ etc/argeo/user/slc/packages.ini | 15 +++++++++++ etc/argeo/user/slc/slc.ini | 7 ++++- usr/bin/argeo | 2 +- usr/bin/jshc | 2 +- usr/lib/argeo/jvm.args | 7 ++++- 12 files changed, 83 insertions(+), 27 deletions(-) rename etc/argeo/user/{cms => rap}/cms.ini (66%) rename etc/argeo/user/{cms => rap}/debug.ini (100%) rename etc/argeo/user/{slc/argeo.ini => rap/packages.ini} (70%) rename etc/argeo/user/{native => rcp}/cms.ini (96%) rename etc/argeo/user/{native => rcp}/debug.ini (100%) create mode 100644 etc/argeo/user/rcp/packages.ini create mode 100644 etc/argeo/user/slc/packages.ini diff --git a/etc/argeo/user/argeo.ini b/etc/argeo/user/argeo.ini index 12ab5a1..9f90778 100644 --- a/etc/argeo/user/argeo.ini +++ b/etc/argeo/user/argeo.ini @@ -1,19 +1,9 @@ - -## OSGi system extensions -org.osgi.framework.system.packages.extra=\ -sun.security.util,\ -sun.security.internal.spec,\ -sun.security.provider,\ -sun.awt.X11,\ -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 +## Launch context +osgi.framework.useSystemProperties=false +osgi.frameworkParentClassloader=app +osgi.parentClassLoader=app +osgi.contextClassLoaderParent=app # Disable Equinox Jetty autostart org.eclipse.equinox.http.jetty.autostart=false -osgi.framework.useSystemProperties=false \ No newline at end of file diff --git a/etc/argeo/user/cms/cms.ini b/etc/argeo/user/rap/cms.ini similarity index 66% rename from etc/argeo/user/cms/cms.ini rename to etc/argeo/user/rap/cms.ini index ba54aeb..ff71b17 100644 --- a/etc/argeo/user/cms/cms.ini +++ b/etc/argeo/user/rap/cms.ini @@ -12,9 +12,20 @@ org.eclipse.rap.rwt.osgi,\ argeo.osgi.start.3=\ org.argeo.cms,\ -org.argeo.cms.swt.rap,\ org.argeo.cms.ee,\ org.argeo.cms.lib.dbus,\ org.argeo.cms.lib.sshd,\ org.argeo.cms.lib.equinox,\ org.argeo.cms.lib.jetty,\ +org.argeo.cms.swt.rap,\ + +argeo.osgi.start.4=\ +org.argeo.cms.jcr + +argeo.osgi.start.5=\ +org.argeo.app.profile.acr.fs,\ +org.argeo.app.core,\ +org.argeo.app.jcr,\ +org.argeo.app.ui,\ +org.argeo.app.theme.default,\ +org.argeo.app.geo,\ diff --git a/etc/argeo/user/cms/debug.ini b/etc/argeo/user/rap/debug.ini similarity index 100% rename from etc/argeo/user/cms/debug.ini rename to etc/argeo/user/rap/debug.ini diff --git a/etc/argeo/user/slc/argeo.ini b/etc/argeo/user/rap/packages.ini similarity index 70% rename from etc/argeo/user/slc/argeo.ini rename to etc/argeo/user/rap/packages.ini index 0f5be10..34758cd 100644 --- a/etc/argeo/user/slc/argeo.ini +++ b/etc/argeo/user/rap/packages.ini @@ -1,13 +1,14 @@ - -## OSGi system extensions -# giving additional access to Argeo Init and Sun Misc org.osgi.framework.system.packages.extra=\ -org.argeo.api.init,\ -org.argeo.api.a2,\ -sun.misc,\ +com.sun.jna,\ +com.sun.jna.internal,\ +com.sun.jna.ptr,\ +com.sun.jna.win32,\ +org.eclipse.angus.mail.mbox,\ +org.apache.tomcat.jni,\ sun.security.util,\ sun.security.internal.spec,\ sun.security.provider,\ +sun.awt.X11,\ com.sun.net.httpserver,\ com.sun.jndi.ldap,\ com.sun.jndi.ldap.sasl,\ @@ -18,3 +19,4 @@ com.sun.nio.sctp # Disable Equinox Jetty autostart org.eclipse.equinox.http.jetty.autostart=false + diff --git a/etc/argeo/user/native/cms.ini b/etc/argeo/user/rcp/cms.ini similarity index 96% rename from etc/argeo/user/native/cms.ini rename to etc/argeo/user/rcp/cms.ini index b34b44d..b4a2f96 100644 --- a/etc/argeo/user/native/cms.ini +++ b/etc/argeo/user/rcp/cms.ini @@ -11,12 +11,13 @@ org.eclipse.equinox.console,\ argeo.osgi.start.3=\ org.argeo.cms,\ -org.argeo.cms.swt.rcp,\ org.argeo.cms.ee,\ +org.argeo.cms.jshell,\ org.argeo.cms.lib.dbus,\ org.argeo.cms.lib.sshd,\ org.argeo.cms.lib.equinox,\ org.argeo.cms.lib.jetty,\ +org.argeo.cms.swt.rcp,\ argeo.osgi.start.4=\ org.argeo.cms.jcr diff --git a/etc/argeo/user/native/debug.ini b/etc/argeo/user/rcp/debug.ini similarity index 100% rename from etc/argeo/user/native/debug.ini rename to etc/argeo/user/rcp/debug.ini diff --git a/etc/argeo/user/rcp/packages.ini b/etc/argeo/user/rcp/packages.ini new file mode 100644 index 0000000..dff2296 --- /dev/null +++ b/etc/argeo/user/rcp/packages.ini @@ -0,0 +1,27 @@ +org.osgi.framework.system.packages.extra=\ +org.eclipse.swt,\ +org.eclipse.swt.awt,\ +org.eclipse.swt.dnd,\ +org.eclipse.swt.events,\ +org.eclipse.swt.graphics,\ +org.eclipse.swt.layout,\ +org.eclipse.swt.widgets,\ +org.eclipse.swt.browser,\ +org.eclipse.swt.custom,\ +com.sun.jna,\ +com.sun.jna.internal,\ +com.sun.jna.ptr,\ +com.sun.jna.win32,\ +org.eclipse.angus.mail.mbox,\ +org.apache.tomcat.jni,\ +sun.security.util,\ +sun.security.internal.spec,\ +sun.security.provider,\ +sun.awt.X11,\ +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 diff --git a/etc/argeo/user/slc/packages.ini b/etc/argeo/user/slc/packages.ini new file mode 100644 index 0000000..1dd6ef1 --- /dev/null +++ b/etc/argeo/user/slc/packages.ini @@ -0,0 +1,15 @@ +org.osgi.framework.system.packages.extra=\ +org.argeo.api.init,\ +org.argeo.api.a2,\ +org.argeo.init.osgi,\ +sun.misc,\ +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 diff --git a/etc/argeo/user/slc/slc.ini b/etc/argeo/user/slc/slc.ini index 02f6e09..6f3c3c0 100644 --- a/etc/argeo/user/slc/slc.ini +++ b/etc/argeo/user/slc/slc.ini @@ -2,14 +2,16 @@ argeo.osgi.sources=\ a2+reference:///\ ?osgi=equinox\ +&swt=rcp\ &include=org.argeo.tp\ &include=org.argeo.tp.osgi\ &include=org.argeo.tp.eclipse\ &include=org.argeo.tp.httpd\ &include=org.argeo.tp.sshd\ -&include=org.argeo.tp.sys\ &include=org.argeo.cms\ &include=org.argeo.slc\ +&include=org.argeo.tp.sys\ +&include=org.argeo.tp.swt\ ## Active modules argeo.osgi.start.2=\ @@ -19,4 +21,7 @@ org.eclipse.equinox.console,\ argeo.osgi.start.3=\ org.argeo.cms,\ org.argeo.cms.lib.dbus,\ +org.argeo.cms.jshell,\ + +argeo.osgi.start.4=\ org.argeo.slc.cms,\ diff --git a/usr/bin/argeo b/usr/bin/argeo index 636fd47..f3a6d5a 100755 --- a/usr/bin/argeo +++ b/usr/bin/argeo @@ -1,2 +1,2 @@ #!/bin/sh -java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.cli.2.3.jar "$@" \ No newline at end of file +java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.cli.2.3.jar "$@" \ No newline at end of file diff --git a/usr/bin/jshc b/usr/bin/jshc index 9344578..0060646 100755 --- a/usr/bin/jshc +++ b/usr/bin/jshc @@ -1,2 +1,2 @@ #!/bin/sh -java -Xms32m -Xmx64m -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.3.jar "$@" \ No newline at end of file +java -Xms32m -Xmx64m -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.3.jar "$@" \ No newline at end of file diff --git a/usr/lib/argeo/jvm.args b/usr/lib/argeo/jvm.args index f03fda7..797aa82 100644 --- a/usr/lib/argeo/jvm.args +++ b/usr/lib/argeo/jvm.args @@ -4,4 +4,9 @@ # Ensure OpenJDK and OpenJ9 are compatible -XX:+IgnoreUnrecognizedVMOptions --cp /usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.3.jar \ No newline at end of file +-cp "\ +/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar\ +:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.3.jar\ +:/usr/local/lib/a2/org.argeo.tp.sys/*\ +:/usr/local/lib/a2/swt/rcp/org.argeo.tp.swt/*\ +" \ No newline at end of file -- 2.30.2