Repository: karaf Updated Branches: refs/heads/karaf-2.x fb7f0ddc0 -> cc2e95f3c
[KARAF-3103] Fix bad association of configuration to bundles Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cc2e95f3 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cc2e95f3 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cc2e95f3 Branch: refs/heads/karaf-2.x Commit: cc2e95f3c2274f53c1c6329cc9d09dea9a964424 Parents: fb7f0dd Author: Guillaume Nodet <[email protected]> Authored: Mon Oct 13 11:10:39 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Mon Oct 13 11:10:39 2014 +0200 ---------------------------------------------------------------------- .../apache/karaf/diagnostic/common/LogDumpProvider.java | 2 +- .../mbeans/config/internal/ConfigMBeanImpl.java | 10 +++++----- .../java/org/apache/karaf/shell/config/DeleteCommand.java | 2 +- .../org/apache/karaf/shell/dev/watch/BundleWatcher.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/cc2e95f3/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java ---------------------------------------------------------------------- diff --git a/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java b/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java index 84adb49..eee675d 100644 --- a/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java +++ b/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java @@ -55,7 +55,7 @@ public class LogDumpProvider implements DumpProvider { // get the PAX Logging configuration ConfigurationAdmin configurationAdmin = (ConfigurationAdmin) bundleContext.getService(ref); try { - Configuration configuration = configurationAdmin.getConfiguration("org.ops4j.pax.logging"); + Configuration configuration = configurationAdmin.getConfiguration("org.ops4j.pax.logging", null); // get the ".file" Pax Logging Properties Dictionary dictionary = configuration.getProperties(); http://git-wip-us.apache.org/repos/asf/karaf/blob/cc2e95f3/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java ---------------------------------------------------------------------- diff --git a/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java b/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java index 150cdc7..9ac7146 100644 --- a/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java +++ b/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java @@ -87,7 +87,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean { } public void delete(String pid) throws Exception { - Configuration configuration = configurationAdmin.getConfiguration(pid); + Configuration configuration = configurationAdmin.getConfiguration(pid, null); if (configuration == null) { throw new IllegalArgumentException("Configuration PID " + pid + " doesn't exist"); } @@ -99,7 +99,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean { } public Map<String, String> listProperties(String pid) throws Exception { - Configuration configuration = configurationAdmin.getConfiguration(pid); + Configuration configuration = configurationAdmin.getConfiguration(pid, null); if (configuration == null) { throw new IllegalArgumentException("Configuration PID " + pid + " doesn't exist"); } @@ -126,7 +126,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean { } public void deleteProperty(String pid, String key) throws Exception { - Configuration configuration = configurationAdmin.getConfiguration(pid); + Configuration configuration = configurationAdmin.getConfiguration(pid, null); if (configuration == null) { throw new IllegalArgumentException("Configuration PID " + pid + " doesn't exist"); } @@ -148,7 +148,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean { } public void appendProperty(String pid, String key, String value) throws Exception { - Configuration configuration = configurationAdmin.getConfiguration(pid); + Configuration configuration = configurationAdmin.getConfiguration(pid, null); if (configuration == null) { throw new IllegalArgumentException("Configuration PID " + pid + " doesn't exist"); } @@ -177,7 +177,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean { } public void setProperty(String pid, String key, String value) throws Exception { - Configuration configuration = configurationAdmin.getConfiguration(pid); + Configuration configuration = configurationAdmin.getConfiguration(pid, null); if (configuration == null) { throw new IllegalArgumentException("Configuration PID " + pid + " doesn't exist"); } http://git-wip-us.apache.org/repos/asf/karaf/blob/cc2e95f3/shell/config/src/main/java/org/apache/karaf/shell/config/DeleteCommand.java ---------------------------------------------------------------------- diff --git a/shell/config/src/main/java/org/apache/karaf/shell/config/DeleteCommand.java b/shell/config/src/main/java/org/apache/karaf/shell/config/DeleteCommand.java index 5abe4f3..26bdcec 100644 --- a/shell/config/src/main/java/org/apache/karaf/shell/config/DeleteCommand.java +++ b/shell/config/src/main/java/org/apache/karaf/shell/config/DeleteCommand.java @@ -53,7 +53,7 @@ public class DeleteCommand extends ConfigCommandSupport { } configuration.delete(); } else { - Configuration configuration = admin.getConfiguration(pid); + Configuration configuration = admin.getConfiguration(pid, null); configuration.delete(); } if (!noDeleteCfgFile) { http://git-wip-us.apache.org/repos/asf/karaf/blob/cc2e95f3/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java ---------------------------------------------------------------------- diff --git a/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java b/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java index 243c904..f254f84 100644 --- a/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java +++ b/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java @@ -204,7 +204,7 @@ public class BundleWatcher implements Runnable, BundleListener { protected MavenConfiguration retrieveMavenConfiguration() { MavenConfiguration mavenConfiguration = null; try { - Configuration configuration = configurationAdmin.getConfiguration(ServiceConstants.PID); + Configuration configuration = configurationAdmin.getConfiguration(ServiceConstants.PID, null); if (configuration != null) { Dictionary dictonary = configuration.getProperties(); if (dictonary != null) {
