You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/12/12 09:47:46 UTC
[1/2] karaf git commit: [KARAF-4673] Rename karaf.shutdown.pid.file
to karaf.pid.file
Repository: karaf
Updated Branches:
refs/heads/master 52689bfe2 -> c9bae0555
[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/02b8adfc
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/02b8adfc
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/02b8adfc
Branch: refs/heads/master
Commit: 02b8adfc89bb7f8ed2b0e0556527484d59298c4f
Parents: 52689bf
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Aug 25 18:37:24 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Dec 12 10:20:33 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/02b8adfc/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 fa521c7..b094d91 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
@@ -159,11 +159,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/02b8adfc/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 e8ff536..d7432da 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/02b8adfc/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 decbcf5..e2f083c 100644
--- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
+++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
@@ -132,6 +132,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";
@@ -223,7 +225,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/02b8adfc/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 36166f6..8d603ea 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
[2/2] karaf git commit: [KARAF-4673] This closes #231
Posted by jb...@apache.org.
[KARAF-4673] This closes #231
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c9bae055
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c9bae055
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c9bae055
Branch: refs/heads/master
Commit: c9bae0555447ed9002217bb41c6da92840b5144e
Parents: 52689bf 02b8adf
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Dec 12 10:47:32 2016 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Dec 12 10:47:32 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(-)
----------------------------------------------------------------------