projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b133e4
)
Fix packaged launch
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 21 Jul 2022 11:40:18 +0000
(13:40 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 21 Jul 2022 11:40:18 +0000
(13:40 +0200)
org.argeo.cms/bnd.bnd
patch
|
blob
|
history
org.argeo.init/src/org/argeo/init/logging/ThinLogging.java
patch
|
blob
|
history
sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service
patch
|
blob
|
history
diff --git
a/org.argeo.cms/bnd.bnd
b/org.argeo.cms/bnd.bnd
index 528afc812b4ab96847a9a62e9de7ecbbfb9b9bd7..927a7555ac06f9bd8471982e18a77a92efcec893 100644
(file)
--- 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,\
Import-Package: \
!com.sun.security.jgss,\
+com.sun.*;resolution:=optional,\
org.osgi.*;version=0.0.0,\
org.apache.xerces.jaxp;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 16e792776566a51502a5aa0924f369cecb8adab3..85ed9eb4fe1a79e24dd4efa92be26f532ddd878b 100644
(file)
--- 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<Map<String, Object>> {
case "org.osgi.service.log.Logger":
case "org.eclipse.osgi.internal.log.LoggerImpl":
case "org.argeo.api.cms.CmsLog":
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":
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 f4f416d7b19fc18b2e7841f78c2ac696d550d2e1..7eb311fd0d91be0c0fba5918cf8d32c707005fa2 100644
(file)
--- 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 \
-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 \
-Declipse.ignoreApp=true \
-Dosgi.noShutdown=true \
-Dorg.eclipse.equinox.http.jetty.autostart=false \