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 2014/11/19 19:05:45 UTC
karaf git commit: [KARAF-3103] Fix bad association of configuration
to bundles
Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x c2a3a5e8b -> dd7b880c1
[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/dd7b880c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dd7b880c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dd7b880c
Branch: refs/heads/karaf-2.3.x
Commit: dd7b880c134090f22f7f038297ed7728536ea65c
Parents: c2a3a5e
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Nov 19 19:04:58 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Nov 19 19:04:58 2014 +0100
----------------------------------------------------------------------
client/dependency-reduced-pom.xml | 12 ++++++------
.../apache/karaf/diagnostic/common/LogDumpProvider.java | 2 +-
.../mbeans/config/internal/ConfigMBeanImpl.java | 10 +++++-----
.../org/apache/karaf/shell/config/DeleteCommand.java | 2 +-
.../org/apache/karaf/shell/dev/watch/BundleWatcher.java | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dd7b880c/client/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/client/dependency-reduced-pom.xml b/client/dependency-reduced-pom.xml
index 74d8750..bb76c71 100644
--- a/client/dependency-reduced-pom.xml
+++ b/client/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>karaf</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>2.3.9-SNAPSHOT</version>
+ <version>2.3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.karaf.client</artifactId>
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>2.3.9-SNAPSHOT</version>
+ <version>2.3.10-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -125,19 +125,19 @@
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
- <version>2.3.9-SNAPSHOT</version>
+ <version>2.3.10-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.modules</artifactId>
- <version>2.3.9-SNAPSHOT</version>
+ <version>2.3.10-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.config</artifactId>
- <version>2.3.9-SNAPSHOT</version>
+ <version>2.3.10-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -155,7 +155,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
- <version>2.3.9-SNAPSHOT</version>
+ <version>2.3.10-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dd7b880c/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 3ce7abe..20d9104 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/dd7b880c/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/dd7b880c/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/dd7b880c/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) {