From 38b432ee473d4d604040fd9c4c234ae17fc7d070 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 21 Jul 2022 13:40:18 +0200 Subject: [PATCH] Fix packaged launch --- org.argeo.cms/bnd.bnd | 1 + org.argeo.init/src/org/argeo/init/logging/ThinLogging.java | 1 + sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd index 528afc812..927a7555a 100644 --- a/org.argeo.cms/bnd.bnd +++ b/org.argeo.cms/bnd.bnd @@ -2,6 +2,7 @@ Bundle-Activator: org.argeo.cms.internal.osgi.CmsActivator Import-Package: \ !com.sun.security.jgss,\ +com.sun.*;resolution:=optional,\ org.osgi.*;version=0.0.0,\ org.apache.xerces.jaxp;resolution:=optional,\ * diff --git a/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java b/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java index 16e792776..85ed9eb4f 100644 --- a/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java +++ b/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java @@ -334,6 +334,7 @@ class ThinLogging implements Consumer> { case "org.osgi.service.log.Logger": case "org.eclipse.osgi.internal.log.LoggerImpl": case "org.argeo.api.cms.CmsLog": + case "org.argeo.init.osgi.OsgiBootUtils": case "org.slf4j.impl.ArgeoLogger": case "org.argeo.cms.internal.osgi.CmsOsgiLogger": case "org.eclipse.jetty.util.log.Slf4jLog": diff --git a/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service b/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service index f4f416d7b..7eb311fd0 100644 --- a/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service +++ b/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service @@ -18,7 +18,7 @@ ExecStart=/usr/lib/jvm/java-17-openjdk-amd64/bin/java \ -Dosgi.configuration.area=/var/lib/argeo.d/%I/state \ -Dosgi.instance.area=/var/lib/argeo.d/%I/data \ -Dargeo.node.repo.indexesBase=/var/cache/argeo.d/%I/indexes \ --Dorg.osgi.framework.bootdelegation=com.sun.net.httpserver,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 \ +-Dorg.osgi.framework.system.packages.extra=com.sun.net.httpserver,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 \ -Declipse.ignoreApp=true \ -Dosgi.noShutdown=true \ -Dorg.eclipse.equinox.http.jetty.autostart=false \ -- 2.30.2