You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2015/06/01 21:18:46 UTC
[2/2] karaf git commit: KARAF-3754 - Child instances should honor
bundle overrides in root
KARAF-3754 - Child instances should honor bundle overrides in root
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bca5d44d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bca5d44d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bca5d44d
Branch: refs/heads/karaf-3.0.x
Commit: bca5d44df8c6dcfcedbecc5e1fb6c1bed3a6c3fd
Parents: 5b8538a
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Mon Jun 1 16:38:29 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Mon Jun 1 16:38:35 2015 -0230
----------------------------------------------------------------------
.../karaf/instance/core/internal/InstanceServiceImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bca5d44d/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index eff6423..7ed6665 100644
--- a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -315,6 +315,12 @@ public class InstanceServiceImpl implements InstanceService {
File rootEtc = new File(System.getProperty("karaf.etc"));
copy(new File(rootEtc, "startup.properties"), new File(karafBase, "etc/startup.properties"));
+ // align child with any bundles we have overriden in the root instance
+ File rootOverrides = new File(rootEtc, "overrides.properties");
+ if (rootOverrides.exists()) {
+ copy(rootOverrides, new File(karafBase, "etc/overrides.properties"));
+ }
+
HashMap<String, String> props = new HashMap<String, String>();
props.put("${SUBST-KARAF-NAME}", name);
props.put("${SUBST-KARAF-HOME}", System.getProperty("karaf.home"));