Author: rombert Date: Tue Sep 19 08:15:22 2017 New Revision: 1808839 URL: http://svn.apache.org/viewvc?rev=1808839&view=rev Log: SLING-7137 - Scripting web console plugins no longer listed
Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingVariablesConsolePlugin.java Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java?rev=1808839&r1=1808838&r2=1808839&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java (original) +++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java Tue Sep 19 08:15:22 2017 @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -42,8 +43,10 @@ import org.osgi.service.component.annota Constants.SERVICE_VENDOR + "=The Apache Software Foundation", WebConsoleConstants.PLUGIN_LABEL + "=" + ScriptCacheConsolePlugin.CONSOLE_LABEL, WebConsoleConstants.PLUGIN_TITLE + "=" + ScriptCacheConsolePlugin.CONSOLE_TITLE, - "felix.webconsole.category=sling" - }) + "felix.webconsole.category=Sling" + }, + service = { Servlet.class } +) public class ScriptCacheConsolePlugin extends AbstractWebConsolePlugin { public static final String CONSOLE_LABEL = "scriptcache"; Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingVariablesConsolePlugin.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingVariablesConsolePlugin.java?rev=1808839&r1=1808838&r2=1808839&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingVariablesConsolePlugin.java (original) +++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingVariablesConsolePlugin.java Tue Sep 19 08:15:22 2017 @@ -21,6 +21,7 @@ import java.net.URL; import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; +import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -39,8 +40,9 @@ import org.osgi.service.component.annota Constants.SERVICE_VENDOR + "=The Apache Software Foundation", WebConsoleConstants.PLUGIN_LABEL + "=" + ScriptingVariablesConsolePlugin.LABEL, WebConsoleConstants.PLUGIN_TITLE + "=" + ScriptingVariablesConsolePlugin.TITLE, - "felix.webconsole.category=sling" - } + "felix.webconsole.category=Sling" + }, + service = { Servlet.class } ) public class ScriptingVariablesConsolePlugin extends AbstractWebConsolePlugin {