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/ffb70653 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ffb70653 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ffb70653 Branch: refs/heads/master Commit: ffb706534aa965c3e07ed8c14b3de8333093fd53 Parents: 898b065 Author: Jonathan Anstey <[email protected]> Authored: Mon Jun 1 16:38:29 2015 -0230 Committer: Jonathan Anstey <[email protected]> Committed: Mon Jun 1 16:41:15 2015 -0230 ---------------------------------------------------------------------- .../karaf/instance/core/internal/InstanceServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/ffb70653/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java index e23f4e8..607538a 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java @@ -340,6 +340,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"));
