This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.jcr.webconsole-1.0.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webconsole.git

commit ef68a5695895bf09c9c8bda4e64d3e04bf155702
Author: Justin Edelson <[email protected]>
AuthorDate: Tue Feb 9 16:12:54 2010 +0000

    SLING-1362 - adding [global] or [local] to printed lines
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webconsole@908099 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../internal/NamespaceConfigurationPrinter.java         | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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 class NamespaceConfigurationPrinter implements 
ConfigurationPrinter {
     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();
                     }
                 }

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to