You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2013/09/17 09:27:29 UTC
svn commit: r1523941 -
/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Author: fmeschbe
Date: Tue Sep 17 07:27:29 2013
New Revision: 1523941
URL: http://svn.apache.org/r1523941
Log:
Register web console plugin with the Sling category
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=1523941&r1=1523940&r2=1523941&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java (original)
+++ sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java Tue Sep 17 07:27:29 2013
@@ -1155,6 +1155,7 @@ public class SlingServletResolver
props.put("felix.webconsole.label", "servletresolver");
props.put("felix.webconsole.title", "Sling Servlet Resolver");
props.put("felix.webconsole.css", "/servletresolver/res/ui/styles.css");
+ props.put("felix.webconsole.category", "Sling");
service = context.registerService(
new String[] { "javax.servlet.Servlet" }, this, props);
@@ -1249,12 +1250,12 @@ public class SlingServletResolver
servlets = Collections.singleton(resource);
} else {
final ResourceCollector locationUtil = ResourceCollector.create(
- resource,
- defaultWorkspaceName,
- requestPathInfo.getExtension(),
- executionPaths,
- defaultExtensions,
- method,
+ resource,
+ defaultWorkspaceName,
+ requestPathInfo.getExtension(),
+ executionPaths,
+ defaultExtensions,
+ method,
requestPathInfo.getSelectors());
servlets = locationUtil.getServlets(resourceResolver);
}