Repository: karaf Updated Branches: refs/heads/karaf-3.0.x b2ec798b3 -> fbc39c2b2
KARAF-4166 - Rename karaf.lock.exclusive property to karaf.lock.slave.block Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fbc39c2b Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fbc39c2b Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fbc39c2b Branch: refs/heads/karaf-3.0.x Commit: fbc39c2b2499a28639c3c7d7b64e80f7719dd34c Parents: b2ec798 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Jan 8 11:11:25 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Jan 8 11:11:25 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/resources/etc/system.properties | 4 ++-- .../org/apache/karaf/instance/resources/etc/system.properties | 4 ++-- main/src/main/java/org/apache/karaf/main/ConfigProperties.java | 6 +++--- main/src/main/java/org/apache/karaf/main/Main.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/fbc39c2b/assemblies/features/framework/src/main/resources/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/etc/system.properties b/assemblies/features/framework/src/main/resources/resources/etc/system.properties index b4f493b..183ffef 100644 --- a/assemblies/features/framework/src/main/resources/resources/etc/system.properties +++ b/assemblies/features/framework/src/main/resources/resources/etc/system.properties @@ -144,5 +144,5 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) # # By default, the slave instances start but are passive. # If you want to prevent the slave instances startup, you can use -# the karaf.lock.exclusive property (false by default): -# karaf.lock.exclusive=true +# the karaf.lock.slave.block property (false by default): +# karaf.lock.slave.block=true http://git-wip-us.apache.org/repos/asf/karaf/blob/fbc39c2b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties index 5a7b8af..a49f55e 100644 --- a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties +++ b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties @@ -133,5 +133,5 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) # # By default, the slave instances start but are passive. # If you want to prevent the slave instances startup, you can use -# the karaf.lock.exclusive property (false by default): -# karaf.lock.exclusive=true \ No newline at end of file +# the karaf.lock.slave.block property (false by default): +# karaf.lock.slave.block=true \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/fbc39c2b/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 1b7adcb..c10b39a 100644 --- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java +++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java @@ -110,7 +110,7 @@ public class ConfigProperties { private static final String PROPERTY_LOCK_LEVEL = "karaf.lock.level"; - private static final String PROPERTY_LOCK_EXCLUSIVE = "karaf.lock.exclusive"; + private static final String PROPERTY_LOCK_SLAVE_BLOCK = "karaf.lock.slave.block"; private static final String DEFAULT_REPO = "karaf.default.repository"; @@ -160,7 +160,7 @@ public class ConfigProperties { int lockStartLevel = 1; int lockDefaultBootLevel = 1; int lockDelay; - boolean lockExclusive; + boolean lockSlaveBlock; int shutdownTimeout = 5 * 60 * 1000; boolean useLock; String lockClass; @@ -225,7 +225,7 @@ public class ConfigProperties { System.setProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, Integer.toString(this.defaultStartLevel)); this.lockStartLevel = Integer.parseInt(props.getProperty(PROPERTY_LOCK_LEVEL, Integer.toString(lockStartLevel))); this.lockDelay = Integer.parseInt(props.getProperty(PROPERTY_LOCK_DELAY, DEFAULT_LOCK_DELAY)); - this.lockExclusive = Boolean.parseBoolean(props.getProperty(PROPERTY_LOCK_EXCLUSIVE, "false")); + this.lockSlaveBlock = Boolean.parseBoolean(props.getProperty(PROPERTY_LOCK_SLAVE_BLOCK, "false")); this.props.setProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, Integer.toString(lockDefaultBootLevel)); this.shutdownTimeout = Integer.parseInt(props.getProperty(KARAF_SHUTDOWN_TIMEOUT, Integer.toString(shutdownTimeout))); this.useLock = Boolean.parseBoolean(props.getProperty(PROPERTY_USE_LOCK, "true")); http://git-wip-us.apache.org/repos/asf/karaf/blob/fbc39c2b/main/src/main/java/org/apache/karaf/main/Main.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java index edd4ef0..e538f64 100644 --- a/main/src/main/java/org/apache/karaf/main/Main.java +++ b/main/src/main/java/org/apache/karaf/main/Main.java @@ -302,7 +302,7 @@ public class Main { lockCallback.lockLost(); } } else { - if (config.lockExclusive) { + if (config.lockSlaveBlock) { LOG.log(Level.SEVERE, "Can't lock, and lock is exclusive"); System.err.println("Can't lock (another instance is running), and lock is exclusive"); System.exit(5);
