Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 70966 invoked from network); 6 Jan 2010 15:57:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Jan 2010 15:57:44 -0000 Received: (qmail 36027 invoked by uid 500); 6 Jan 2010 15:57:44 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 35973 invoked by uid 500); 6 Jan 2010 15:57:44 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 35964 invoked by uid 99); 6 Jan 2010 15:57:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jan 2010 15:57:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jan 2010 15:57:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 53A9823889BF; Wed, 6 Jan 2010 15:57:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r896497 - in /sling/trunk/bundles/scripting/core: pom.xml src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineConsolePlugin.java Date: Wed, 06 Jan 2010 15:57:18 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100106155720.53A9823889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Jan 6 15:57:15 2010 New Revision: 896497 URL: http://svn.apache.org/viewvc?rev=896497&view=rev Log: SLING-1268 : Remove direct dependency to web console Modified: sling/trunk/bundles/scripting/core/pom.xml sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineConsolePlugin.java Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=896497&r1=896496&r2=896497&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Wed Jan 6 15:57:15 2010 @@ -159,12 +159,6 @@ org.osgi org.osgi.compendium - - org.apache.felix - org.apache.felix.webconsole - 1.2.0 - provided - org.slf4j Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineConsolePlugin.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineConsolePlugin.java?rev=896497&r1=896496&r2=896497&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineConsolePlugin.java (original) +++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineConsolePlugin.java Wed Jan 6 15:57:15 2010 @@ -27,16 +27,15 @@ import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; +import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.felix.webconsole.AbstractWebConsolePlugin; -import org.apache.felix.webconsole.WebConsoleConstants; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; -public class ScriptEngineConsolePlugin extends AbstractWebConsolePlugin { +public class ScriptEngineConsolePlugin extends HttpServlet { private static final String LABEL = "scriptengines"; @@ -75,17 +74,7 @@ } @Override - public String getLabel() { - return LABEL; - } - - @Override - public String getTitle() { - return "Script Engines"; - } - - @Override - protected void renderContent(HttpServletRequest req, HttpServletResponse res) + protected void service(HttpServletRequest req, HttpServletResponse res) throws IOException { PrintWriter pw = res.getWriter(); @@ -159,17 +148,16 @@ } public void activate(BundleContext context) { - super.activate(context); - - Dictionary props = new Hashtable(); + final Dictionary props = new Hashtable(); props.put(Constants.SERVICE_DESCRIPTION, "Web Console Plugin for ScriptEngine implementations"); props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation"); props.put(Constants.SERVICE_PID, getClass().getName()); - props.put(WebConsoleConstants.PLUGIN_LABEL, LABEL); + props.put("felix.webconsole.label", LABEL); + props.put("felix.webconsole.title", "Script Engines"); serviceRegistration = context.registerService( - WebConsoleConstants.SERVICE_NAME, this, props); + "javax.servlet.Servlet", this, props); } public void deactivate() { @@ -177,8 +165,5 @@ serviceRegistration.unregister(); serviceRegistration = null; } - - super.deactivate(); } - }