Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 46747 invoked from network); 14 Jan 2009 18:59:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jan 2009 18:59:52 -0000 Received: (qmail 82407 invoked by uid 500); 14 Jan 2009 18:59:52 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 82382 invoked by uid 500); 14 Jan 2009 18:59:52 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 82373 invoked by uid 99); 14 Jan 2009 18:59:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2009 10:59:52 -0800 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, 14 Jan 2009 18:59:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 883D4238889E; Wed, 14 Jan 2009 10:59:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r734484 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java Date: Wed, 14 Jan 2009 18:59:31 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090114185931.883D4238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Jan 14 10:59:31 2009 New Revision: 734484 URL: http://svn.apache.org/viewvc?rev=734484&view=rev Log: Correct response type. Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java?rev=734484&r1=734483&r2=734484&view=diff ============================================================================== --- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java (original) +++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java Wed Jan 14 10:59:31 2009 @@ -19,14 +19,7 @@ import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Date; -import java.util.Dictionary; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -37,15 +30,8 @@ import org.apache.felix.webconsole.internal.servlet.OsgiManager; import org.json.JSONException; import org.json.JSONWriter; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleEvent; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceRegistration; -import org.osgi.service.event.Event; -import org.osgi.service.event.EventAdmin; -import org.osgi.service.event.EventConstants; -import org.osgi.service.event.EventHandler; +import org.osgi.framework.*; +import org.osgi.service.event.*; public class EventAdminServlet extends BaseWebConsolePlugin implements EventHandler @@ -228,7 +214,7 @@ final String info = request.getPathInfo(); if ( info.endsWith( ".json" ) ) { - response.setContentType( "text/javascript" ); + response.setContentType( "application/json" ); response.setCharacterEncoding( "UTF-8" ); PrintWriter pw = response.getWriter();