You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2009/01/14 19:59:31 UTC
svn commit: r734484 -
/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java
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();