You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/05/24 15:54:11 UTC
svn commit: r1796075 -
/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java
Author: sseifert
Date: Wed May 24 15:54:11 2017
New Revision: 1796075
URL: http://svn.apache.org/viewvc?rev=1796075&view=rev
Log:
SLING-6882 CAConfig Impl: Display context paths and config refs in web console
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java
Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java?rev=1796075&r1=1796074&r2=1796075&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/ConfigurationWebConsolePlugin.java Wed May 24 15:54:11 2017
@@ -23,6 +23,7 @@ import java.io.PrintWriter;
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
@@ -41,6 +42,8 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.caconfig.management.ConfigurationData;
import org.apache.sling.caconfig.management.ConfigurationManager;
import org.apache.sling.caconfig.management.ValueInfo;
+import org.apache.sling.caconfig.management.multiplexer.ContextPathStrategyMultiplexer;
+import org.apache.sling.caconfig.resource.spi.ContextResource;
import org.apache.sling.xss.XSSAPI;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Component;
@@ -72,6 +75,9 @@ public class ConfigurationWebConsolePlug
private ConfigurationManager configurationManager;
@Reference(policyOption = ReferencePolicyOption.GREEDY)
+ private ContextPathStrategyMultiplexer contextPathStrategyMultiplexer;
+
+ @Reference(policyOption = ReferencePolicyOption.GREEDY)
private XSSAPI xss;
@Override
@@ -161,7 +167,22 @@ public class ConfigurationWebConsolePlug
pw.println("<br/>");
if (contentResource != null) {
+
+ // context paths
+ Iterator<ContextResource> contextResources = contextPathStrategyMultiplexer.findContextResources(contentResource);
+ tableStart(pw, "Context paths", 2);
+ pw.println("<th>Context path</th>");
+ pw.println("<th>Config reference</th>");
+ while (contextResources.hasNext()) {
+ ContextResource contextResource = contextResources.next();
+ tableRows(pw);
+ pw.println("<td>" + xss.encodeForHTML(contextResource.getResource().getPath()) + "</td>");
+ pw.println("<td>" + xss.encodeForHTML(contextResource.getConfigRef()) + "</td>");
+ }
+ tableEnd(pw);
+ pw.println("<br/>");
+
// resolve configuration
Collection<ConfigurationData> configDatas;
if (resourceCollection) {
@@ -176,7 +197,7 @@ public class ConfigurationWebConsolePlug
configDatas = Collections.emptyList();
}
}
-
+
tableStart(pw, "Result", 6);
if (configDatas.size() == 0) {