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/06/29 22:00:25 UTC
[1/2] karaf git commit: [KARAF-4510] Initial instance.properties file
root location does not use karaf.base
Repository: karaf
Updated Branches:
refs/heads/master 62cee1c57 -> d082f8239
[KARAF-4510] Initial instance.properties file root location does not use karaf.base
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ed24832d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ed24832d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ed24832d
Branch: refs/heads/master
Commit: ed24832d411a724ec81638bf6e87a61f4bd04b34
Parents: 62cee1c
Author: Fr�d�rik Rouleau <fr...@prosodie.com>
Authored: Wed May 11 09:49:36 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Wed Jun 29 23:39:12 2016 +0200
----------------------------------------------------------------------
main/src/main/java/org/apache/karaf/main/InstanceHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ed24832d/main/src/main/java/org/apache/karaf/main/InstanceHelper.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/InstanceHelper.java b/main/src/main/java/org/apache/karaf/main/InstanceHelper.java
index 8b9ebaa..deeb739 100644
--- a/main/src/main/java/org/apache/karaf/main/InstanceHelper.java
+++ b/main/src/main/java/org/apache/karaf/main/InstanceHelper.java
@@ -38,7 +38,7 @@ import org.osgi.framework.launch.Framework;
public class InstanceHelper {
- static void updateInstancePid(final File karafHome, File karafBase, final boolean isStartingInstance) {
+ static void updateInstancePid(final File karafHome, final File karafBase, final boolean isStartingInstance) {
try {
final String instanceName = System.getProperty("karaf.name");
final String pid = isStartingInstance ? getPid() : "0";
@@ -88,7 +88,7 @@ public class InstanceHelper {
// it's the first instance running, so we consider as root
props.setProperty("count", "1");
props.setProperty("item.0.name", instanceName);
- props.setProperty("item.0.loc", karafHome.getAbsolutePath());
+ props.setProperty("item.0.loc", karafBase.getAbsolutePath());
props.setProperty("item.0.pid", pid);
props.setProperty("item.0.root", "true");
} else {
[2/2] karaf git commit: [KARAF-4510] This closes #183
Posted by jb...@apache.org.
[KARAF-4510] This closes #183
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d082f823
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d082f823
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d082f823
Branch: refs/heads/master
Commit: d082f8239c4856707e9c8546ff9f06af8df419a7
Parents: 62cee1c ed24832
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Jun 30 00:00:14 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Jun 30 00:00:14 2016 +0200
----------------------------------------------------------------------
main/src/main/java/org/apache/karaf/main/InstanceHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------