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/07/10 17:21:55 UTC
[1/2] git commit: [KARAF-1553] Command service references should be
AUTO_EXPORT_INTERFACES
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 3b72ac0d7 -> 6e5557515
[KARAF-1553] Command service references should be AUTO_EXPORT_INTERFACES
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6e555751
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6e555751
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6e555751
Branch: refs/heads/karaf-3.0.x
Commit: 6e5557515ec94546ced88152419e911492527a89
Parents: d6a9f18
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jul 10 16:25:04 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jul 10 17:21:49 2014 +0200
----------------------------------------------------------------------
.../apache/karaf/shell/console/commands/NamespaceHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6e555751/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
index 31d0b10..7fc7af3 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
@@ -157,7 +157,7 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan
MutableServiceMetadata commandService = context.createMetadata(MutableServiceMetadata.class);
commandService.setActivation(MutableServiceMetadata.ACTIVATION_LAZY);
commandService.setId(getName());
- commandService.setAutoExport(ServiceMetadata.AUTO_EXPORT_ALL_CLASSES);
+ commandService.setAutoExport(ServiceMetadata.AUTO_EXPORT_INTERFACES);
commandService.setServiceComponent(command);
String scope = null;
@@ -225,7 +225,7 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan
MutableServiceMetadata subShellCommandService = context.createMetadata(MutableServiceMetadata.class);
subShellCommandService.setActivation(MutableServiceMetadata.ACTIVATION_LAZY);
subShellCommandService.setId(subShellName == null ? getName() : subShellName);
- subShellCommandService.setAutoExport(ServiceMetadata.AUTO_EXPORT_ALL_CLASSES);
+ subShellCommandService.setAutoExport(ServiceMetadata.AUTO_EXPORT_INTERFACES);
subShellCommandService.setServiceComponent(subShellCommand);
subShellCommandService.addServiceProperty(createStringValue(context, "osgi.command.scope"), createStringValue(context, "*"));
if (scope != null && !scope.isEmpty()) {
[2/2] git commit: [KARAF-3108] Fix webconsole CSS
Posted by gn...@apache.org.
[KARAF-3108] Fix webconsole CSS
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d6a9f184
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d6a9f184
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d6a9f184
Branch: refs/heads/karaf-3.0.x
Commit: d6a9f18447feec2dcd7acbf26ca9d5743b3a3657
Parents: 3b72ac0
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jul 10 11:48:02 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jul 10 17:21:49 2014 +0200
----------------------------------------------------------------------
.../main/resources/res/karaf/ui/webconsole.css | 30 ++++++++++++++++----
1 file changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d6a9f184/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
----------------------------------------------------------------------
diff --git a/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css b/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
index a31e6bc..03fa9dd 100644
--- a/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
+++ b/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
@@ -66,6 +66,24 @@
white-space: nowrap;
}
+/* New Category Based Navigation Tree (FELIX-3769) */
+#navmenu {
+ width: auto;
+}
+
+#navmenu li.ui-menu-item {
+ width: auto;
+}
+
+#navmenu li.navMenuItem-0 {
+ display: inline-block;
+}
+
+/* Don't display caret on top-level menu (FELIX-3841) */
+#navmenu li.navMenuItem-0 > a > span {
+ display: none;
+}
+
/* CENTRAL CONTENT AREA STYLING */
#content, .ui-widget, .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 8pt }
@@ -119,16 +137,16 @@ table.nicetable th, table.nicetable td {
/* tablesorter styling */
tr .header {
- background-image: url(../lib/bg.gif);
- background-repeat: no-repeat;
- background-position: center right;
- cursor: pointer;
+ background-image: url(../lib/bg.gif) !important;
+ background-repeat: no-repeat !important;
+ background-position: center right !important;
+ cursor: pointer !important;
}
tr .headerSortUp {
- background-image: url(../lib/asc.gif);
+ background-image: url(../lib/asc.gif) !important;
}
tr .headerSortDown {
- background-image: url(../lib/desc.gif);
+ background-image: url(../lib/desc.gif) !important;
}
/* status line */