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 2014/03/27 21:15:11 UTC
[1/2] git commit: [KARAF-2805] Improve logging for command
registration
Repository: karaf
Updated Branches:
refs/heads/master 99bbb9e39 -> c3aa9da26
[KARAF-2805] Improve logging for command registration
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c3aa9da2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c3aa9da2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c3aa9da2
Branch: refs/heads/master
Commit: c3aa9da260912899f4f7693b61dcdc6d7b541c83
Parents: f060e00
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Mar 27 17:33:04 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 27 21:14:53 2014 +0100
----------------------------------------------------------------------
.../karaf/shell/impl/action/osgi/CommandExtension.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c3aa9da2/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
index 865933f..7f9e3ee 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
@@ -71,6 +71,9 @@ public class CommandExtension implements Extension, Satisfiable {
@Override
public void found() {
+ LOGGER.info("Registering commands for bundle {}/{}",
+ bundle.getSymbolicName(),
+ bundle.getVersion());
for (Satisfiable s : satisfiables) {
s.found();
}
@@ -117,7 +120,10 @@ public class CommandExtension implements Extension, Satisfiable {
}
tracker.open();
if (!tracker.isSatisfied()) {
- LOGGER.info("Command registration delayed. Missing dependencies: " + tracker.getMissingServices());
+ LOGGER.info("Command registration delayed for bundle {}/{}. Missing dependencies: {}",
+ bundle.getSymbolicName(),
+ bundle.getVersion(),
+ tracker.getMissingServices());
}
} finally {
started.countDown();
[2/2] git commit: [KARAF-2847] Connect connect to the root instance
Posted by gn...@apache.org.
[KARAF-2847] Connect connect to the root instance
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f060e008
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f060e008
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f060e008
Branch: refs/heads/master
Commit: f060e00869d0ff61dd1e29d919951628e3da71f6
Parents: 99bbb9e
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Mar 27 17:31:51 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 27 21:14:53 2014 +0100
----------------------------------------------------------------------
.../apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f060e008/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java
index 0814d1e..14b0c5a 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java
@@ -77,6 +77,7 @@ public class LocalConsoleManager {
new JLineTerminal(terminal),
encoding,
callback);
+ registration = bundleContext.registerService(Session.class, session, null);
String name = "Karaf local console user " + ShellUtil.getCurrentUserName();
boolean delayconsole = Boolean.parseBoolean(System.getProperty("karaf.delay.console"));
if (delayconsole) {