Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 88c589d13 -> 0e884605e
[KARAF-4673] Rename karaf.shutdown.pid.file to karaf.pid.file Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0e884605 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0e884605 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0e884605 Branch: refs/heads/karaf-4.0.x Commit: 0e884605edd7b6f7f08d3c0b0f0e2be09277ca2a Parents: 88c589d Author: lburgazzoli <[email protected]> Authored: Thu Aug 25 18:37:24 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Dec 12 10:50:19 2016 +0100 ---------------------------------------------------------------------- .../main/filtered-resources/resources/etc/config.properties | 7 ++++++- demos/web/src/main/webapp/WEB-INF/karaf/etc/config.properties | 7 ++++++- .../src/main/java/org/apache/karaf/main/ConfigProperties.java | 4 +++- main/src/test/resources/test-karaf-home/etc/config.properties | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0e884605/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 87956d6..62b3f24 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 @@ -157,11 +157,16 @@ org.osgi.framework.startlevel.beginning=100 karaf.startlevel.bundle=80 # -# The location of the Karaf shutdown port file +# The location of the Karaf shutdown port file used to stop instance # karaf.shutdown.port.file=${karaf.data}/port # +# The location of the Karaf pid file +# +karaf.pid.file=${karaf.base}/karaf.pid + +# # Configuration FileMonitor properties # felix.fileinstall.enableConfigSave = true http://git-wip-us.apache.org/repos/asf/karaf/blob/0e884605/demos/web/src/main/webapp/WEB-INF/karaf/etc/config.properties ---------------------------------------------------------------------- diff --git a/demos/web/src/main/webapp/WEB-INF/karaf/etc/config.properties b/demos/web/src/main/webapp/WEB-INF/karaf/etc/config.properties index 4402d4f..8337c84 100644 --- a/demos/web/src/main/webapp/WEB-INF/karaf/etc/config.properties +++ b/demos/web/src/main/webapp/WEB-INF/karaf/etc/config.properties @@ -333,11 +333,16 @@ org.osgi.framework.startlevel.beginning=100 karaf.startlevel.bundle=80 # -# The location of the Karaf shutdown port file +# The location of the Karaf shutdown port file used to stop instance # karaf.shutdown.port.file=${karaf.data}/port # +# The location of the Karaf pid port file +# +karaf.pid.file=${karaf.base}/karaf.pid + +# # Configuration FileMonitor properties # felix.fileinstall.enableConfigSave = true http://git-wip-us.apache.org/repos/asf/karaf/blob/0e884605/main/src/main/java/org/apache/karaf/main/ConfigProperties.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java index e5d5705..ebf9b1b 100644 --- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java +++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java @@ -130,6 +130,8 @@ public class ConfigProperties { private static final String KARAF_SHUTDOWN_COMMAND = "karaf.shutdown.command"; private static final String KARAF_SHUTDOWN_PID_FILE = "karaf.shutdown.pid.file"; + + private static final String KARAF_PID_FILE = "karaf.pid.file"; private static final String KARAF_STARTUP_MESSAGE = "karaf.startup.message"; @@ -217,7 +219,7 @@ public class ConfigProperties { this.defaultRepo = System.getProperty(DEFAULT_REPO, "system"); this.bundleLocations = props.getProperty(BUNDLE_LOCATIONS); this.defaultBundleStartlevel = getDefaultBundleStartLevel(60); - this.pidFile = props.getProperty(KARAF_SHUTDOWN_PID_FILE); + this.pidFile = props.getProperty(KARAF_PID_FILE, props.getProperty(KARAF_SHUTDOWN_PID_FILE)); this.shutdownPort = Integer.parseInt(props.getProperty(KARAF_SHUTDOWN_PORT, "0")); this.shutdownHost = props.getProperty(KARAF_SHUTDOWN_HOST, "localhost"); this.portFile = props.getProperty(KARAF_SHUTDOWN_PORT_FILE); http://git-wip-us.apache.org/repos/asf/karaf/blob/0e884605/main/src/test/resources/test-karaf-home/etc/config.properties ---------------------------------------------------------------------- diff --git a/main/src/test/resources/test-karaf-home/etc/config.properties b/main/src/test/resources/test-karaf-home/etc/config.properties index e178392..af273b9 100755 --- a/main/src/test/resources/test-karaf-home/etc/config.properties +++ b/main/src/test/resources/test-karaf-home/etc/config.properties @@ -33,7 +33,8 @@ karaf.framework=felix # karaf.framework.felix=mvn:org.apache.felix/org.apache.felix.framework/4.0.2 -karaf.shutdown.port.file=${karaf.base}/data/port +karaf.shutdown.port.file=${karaf.data}/port +karaf.pid.file=${karaf.base}/karaf.pid org.osgi.framework.startlevel.beginning=100 karaf.startlevel.bundle=60
