SLING-1362 - adding [global] or [local] to printed lines
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@908099 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java b/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
index c9342a1..f69a634 100644
--- a/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
+++ b/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
@@ -19,9 +19,12 @@
package org.apache.sling.jcr.webconsole.internal;
import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
import javax.jcr.NamespaceRegistry;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.felix.webconsole.ConfigurationPrinter;
import org.apache.sling.jcr.api.SlingRepository;
@@ -63,11 +66,17 @@
public void printConfiguration(PrintWriter pw) {
if (slingRepository != null) {
try {
- NamespaceRegistry reg = slingRepository.loginAdministrative(slingRepository.getDefaultWorkspace()).getWorkspace()
- .getNamespaceRegistry();
- for (String prefix : reg.getPrefixes()) {
+ Session session = slingRepository.loginAdministrative(null);
+ NamespaceRegistry reg = session.getWorkspace().getNamespaceRegistry();
+ List<String> globalPrefixes = Arrays.asList(reg.getPrefixes());
+ for (String prefix : session.getNamespacePrefixes()) {
if (prefix.length() > 0) {
- pw.printf("%10s = %s", prefix, reg.getURI(prefix));
+ pw.printf("%10s = %s", prefix, session.getNamespaceURI(prefix));
+ if (globalPrefixes.contains(prefix)) {
+ pw.print(" [global]");
+ } else {
+ pw.print(" [local]");
+ }
pw.println();
}
}
