Repository: karaf Updated Branches: refs/heads/karaf-4.1.x d3b3d3f36 -> 6c64ecad8
Better integration with fileinstall and configs Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6c64ecad Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6c64ecad Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6c64ecad Branch: refs/heads/karaf-4.1.x Commit: 6c64ecad866f275b882736b2510ae34af659dff7 Parents: d3b3d3f Author: Guillaume Nodet <[email protected]> Authored: Mon Jul 31 21:30:21 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Sep 26 09:15:38 2017 +0200 ---------------------------------------------------------------------- .../features/internal/service/FeatureConfigInstaller.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6c64ecad/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java index 29b5eb7..b2ecefa 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java @@ -109,6 +109,16 @@ public class FeatureConfigInstaller { cfg = createConfiguration(configAdmin, pid[0], pid[1]); String key = createConfigurationKey(pid[0], pid[1]); cfgProps.put(CONFIG_KEY, key); + props.put(CONFIG_KEY, key); + if (storage != null && configCfgStore) { + File cfgFile; + if (pid[1] != null) { + cfgFile = new File(storage, pid[0] + "-" + pid[1] + ".cfg"); + } else { + cfgFile = new File(storage, pid[0] + ".cfg"); + } + cfgProps.put(FILEINSTALL_FILE_NAME, cfgFile.getAbsoluteFile().toURI().toString()); + } cfg.update(cfgProps); try { updateStorage(pid[0], pid[1], props, false);
