FELIX-878 : Add export of configurations as json. The configs are exported by adding ".json" to the request url. The url can either contain a pid as the path info or a filter expression.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@734512 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
index 937b512..f20b81c 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
@@ -177,11 +177,18 @@
pw.write("[");
final SortedMap services = this.getServices(pid, pidFilter, locale, false);
final Iterator i = services.keySet().iterator();
+ boolean printColon = false;
while ( i.hasNext() ) {
final String servicePid = i.next().toString();
final Configuration config = this.getConfiguration(ca, servicePid);
- this.printConfigurationJson(pw, servicePid, config, pidFilter, locale);
+ if ( config != null ) {
+ if ( printColon ) {
+ pw.print(',');
+ }
+ this.printConfigurationJson(pw, servicePid, config, pidFilter, locale);
+ printColon = true;
+ }
}
pw.write("]");
} catch (InvalidSyntaxException e) {