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 10:34:59 UTC
git commit: [KARAF-2855] The config:list command should sort
configurations and properties
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x e32fca575 -> bd8753b18
[KARAF-2855] The config:list command should sort configurations and properties
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bd8753b1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bd8753b1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bd8753b1
Branch: refs/heads/karaf-3.0.x
Commit: bd8753b1841194ec099461c797c8d882b9a90215
Parents: e32fca5
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Mar 27 09:24:54 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 27 10:34:53 2014 +0100
----------------------------------------------------------------------
.../org/apache/karaf/config/command/ListCommand.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bd8753b1/config/command/src/main/java/org/apache/karaf/config/command/ListCommand.java
----------------------------------------------------------------------
diff --git a/config/command/src/main/java/org/apache/karaf/config/command/ListCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/ListCommand.java
index c6c7d57..ca0476e 100644
--- a/config/command/src/main/java/org/apache/karaf/config/command/ListCommand.java
+++ b/config/command/src/main/java/org/apache/karaf/config/command/ListCommand.java
@@ -18,6 +18,8 @@ package org.apache.karaf.config.command;
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.Map;
+import java.util.TreeMap;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
@@ -33,7 +35,12 @@ public class ListCommand extends ConfigCommandSupport {
protected Object doExecute() throws Exception {
Configuration[] configs = configRepository.getConfigAdmin().listConfigurations(query);
if (configs != null) {
+ Map<String, Configuration> sortedConfigs = new TreeMap<String, Configuration>();
for (Configuration config : configs) {
+ sortedConfigs.put(config.getPid(), config);
+ }
+ for (String pid : sortedConfigs.keySet()) {
+ Configuration config = sortedConfigs.get(pid);
System.out.println("----------------------------------------------------------------");
System.out.println("Pid: " + config.getPid());
if (config.getFactoryPid() != null) {
@@ -43,9 +50,13 @@ public class ListCommand extends ConfigCommandSupport {
if (config.getProperties() != null) {
System.out.println("Properties:");
Dictionary props = config.getProperties();
+ Map<String, Object> sortedProps = new TreeMap<String, Object>();
for (Enumeration e = props.keys(); e.hasMoreElements();) {
Object key = e.nextElement();
- System.out.println(" " + key + " = " + props.get(key));
+ sortedProps.put(key.toString(), props.get(key));
+ }
+ for (String key : sortedProps.keySet()) {
+ System.out.println(" " + key + " = " + sortedProps.get(key));
}
}
}