You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/10/12 10:59:11 UTC
karaf git commit: [KARAF-5417][KARAF-4188] Add detailed instructions
to enable systemd watchdog
Repository: karaf
Updated Branches:
refs/heads/master 01ca22e97 -> b03bd9620
[KARAF-5417][KARAF-4188] Add detailed instructions to enable systemd watchdog
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b03bd962
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b03bd962
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b03bd962
Branch: refs/heads/master
Commit: b03bd9620d994044780fd2cca014b16bea72747c
Parents: 01ca22e
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Oct 12 12:58:36 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Oct 12 12:58:54 2017 +0200
----------------------------------------------------------------------
.../filtered-resources/resources/etc/config.properties | 12 +++++++++++-
.../src/test/filtered-resources/etc/config.properties | 12 +++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b03bd962/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index 5d4f5cc..74c33d0 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -233,4 +233,14 @@ karaf.delay.console=false
#
# Enable native Karaf support for systemd's watchdog.
#
-#karaf.systemd.enabled=false
+# In addition to setting the flag to true, the JNA library needs to be made
+# available to the main classloader by adding the two following libraries
+# to the lib/boot directory
+# mvn:net.java.dev.jna/jna/${jna.version}
+# mvn:net.java.dev.jna/jna-platform/${jna.version}
+# or by building a custom distribution and adding the following lines for the
+# karaf maven plugin configuration:
+# <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
+# <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
+#
+#karaf.systemd.enabled=true
http://git-wip-us.apache.org/repos/asf/karaf/blob/b03bd962/itests/src/test/filtered-resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/itests/src/test/filtered-resources/etc/config.properties b/itests/src/test/filtered-resources/etc/config.properties
index 28fc28f..723b46d 100644
--- a/itests/src/test/filtered-resources/etc/config.properties
+++ b/itests/src/test/filtered-resources/etc/config.properties
@@ -214,4 +214,14 @@ karaf.delay.console=false
#
# Enable native Karaf support for systemd's watchdog.
#
-#karaf.systemd.enabled=false
+# In addition to setting the flag to true, the JNA library needs to be made
+# available to the main classloader by adding the two following libraries
+# to the lib/boot directory
+# mvn:net.java.dev.jna/jna/${jna.version}
+# mvn:net.java.dev.jna/jna-platform/${jna.version}
+# or by building a custom distribution and adding the following lines for the
+# karaf maven plugin configuration:
+# <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
+# <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
+#
+#karaf.systemd.enabled=true