You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/03/05 10:51:08 UTC
[1/3] karaf git commit: [KARAF-3586] Upgrade to pax-logging 1.8.2
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 067a7fc96 -> d0d09aa8a
[KARAF-3586] Upgrade to pax-logging 1.8.2
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/389060a4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/389060a4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/389060a4
Branch: refs/heads/karaf-2.x
Commit: 389060a41a09e674e16c8e2bff10ba95fc221d42
Parents: d91008d
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Mar 4 17:25:50 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 5 10:50:45 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/389060a4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 615f960..f62000c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@
<pax.base.version>1.5.0</pax.base.version>
<pax.cdi.version>0.11.0</pax.cdi.version>
<pax.exam.version>4.4.0</pax.exam.version>
- <pax.logging.version>1.8.1</pax.logging.version>
+ <pax.logging.version>1.8.2</pax.logging.version>
<pax.url.version>2.4.0-SNAPSHOT</pax.url.version>
<pax.swissbox.version>1.7.1</pax.swissbox.version>
<pax.web.version>3.1.4</pax.web.version>
[2/3] karaf git commit: [KARAF-3577] Avoid binding the configuration
to the bundle
Posted by gn...@apache.org.
[KARAF-3577] Avoid binding the configuration to the bundle
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d91008dd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d91008dd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d91008dd
Branch: refs/heads/karaf-2.x
Commit: d91008dd34960576475ffa40151fc49e14d53027
Parents: 067a7fc
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Mar 2 13:16:36 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 5 10:50:45 2015 +0100
----------------------------------------------------------------------
.../shell/security/impl/SecuredCommandConfigTransformer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d91008dd/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
index ba9cd91..3b44765 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
@@ -117,7 +117,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
// update config admin with the generated configuration
for (Map.Entry<String, Dictionary<String, Object>> entry : configMaps.entrySet()) {
- Configuration genConfig = configAdmin.getConfiguration(entry.getKey());
+ Configuration genConfig = configAdmin.getConfiguration(entry.getKey(), null);
genConfig.update(entry.getValue());
}
}
@@ -162,7 +162,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
deleteServiceGuardConfig(event.getPid(), event.getPid().substring(PROXY_COMMAND_ACL_PID_PREFIX.length()));
break;
case ConfigurationEvent.CM_UPDATED:
- Configuration config = configAdmin.getConfiguration(event.getPid());
+ Configuration config = configAdmin.getConfiguration(event.getPid(), null);
generateServiceGuardConfig(config);
refreshTheAffectedShellCommandBundle(event, config);
break;
[3/3] karaf git commit: [KARAF-3587] Upgrade to pax-url 2.4.0
Posted by gn...@apache.org.
[KARAF-3587] Upgrade to pax-url 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d0d09aa8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d0d09aa8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d0d09aa8
Branch: refs/heads/karaf-2.x
Commit: d0d09aa8a99d1ef686412ce3b4e2a556d24d13cb
Parents: 389060a
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Mar 4 17:26:03 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 5 10:50:46 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d0d09aa8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f62000c..65575ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,7 @@
<pax.cdi.version>0.11.0</pax.cdi.version>
<pax.exam.version>4.4.0</pax.exam.version>
<pax.logging.version>1.8.2</pax.logging.version>
- <pax.url.version>2.4.0-SNAPSHOT</pax.url.version>
+ <pax.url.version>2.4.0</pax.url.version>
<pax.swissbox.version>1.7.1</pax.swissbox.version>
<pax.web.version>3.1.4</pax.web.version>
<pax.tinybundles.version>1.3.2</pax.tinybundles.version>