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 2016/09/12 17:29:26 UTC
karaf git commit: [KARAF-4677] Re-introduce the
org/apache/karaf/branding/branding.properties loading
Repository: karaf
Updated Branches:
refs/heads/karaf-4.0.x e1d3abfc4 -> dde07e60d
[KARAF-4677] Re-introduce the org/apache/karaf/branding/branding.properties loading
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dde07e60
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dde07e60
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dde07e60
Branch: refs/heads/karaf-4.0.x
Commit: dde07e60d10a2271986536e221ca44e3c69cb303
Parents: e1d3abf
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Sep 12 19:28:28 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Sep 12 19:28:28 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/impl/console/Branding.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dde07e60/shell/core/src/main/java/org/apache/karaf/shell/impl/console/Branding.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/Branding.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/Branding.java
index f454e93..6af4691 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/Branding.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/Branding.java
@@ -42,9 +42,11 @@ public final class Branding {
Properties props = new Properties();
if (terminal != null && terminal.getClass().getName().endsWith("SshTerminal")) {
loadProps(props, "org/apache/karaf/shell/console/branding-ssh.properties");
+ loadProps(props, "org/apache/karaf/branding/branding.properties");
return loadEtcBrandingFile("branding-ssh.properties",props);
} else {
loadProps(props, "org/apache/karaf/shell/console/branding.properties");
+ loadProps(props, "org/apache/karaf/branding/branding.properties");
return loadEtcBrandingFile("branding.properties",props);
}
}