You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2011/11/19 00:46:04 UTC
svn commit: r1203903 - in
/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal:
./ manager/
Author: fmeschbe
Date: Fri Nov 18 23:46:04 2011
New Revision: 1203903
URL: http://svn.apache.org/viewvc?rev=1203903&view=rev
Log:
FELIX-3237 Implement a Web Console plugin
Added:
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpWhiteboardWebConsolePlugin.java (with props)
Modified:
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/WhiteboardActivator.java
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/DefaultHttpContext.java
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/FilterMapping.java
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ServletMapping.java
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/WhiteboardActivator.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/WhiteboardActivator.java?rev=1203903&r1=1203902&r2=1203903&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/WhiteboardActivator.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/WhiteboardActivator.java Fri Nov 18 23:46:04 2011
@@ -16,6 +16,8 @@
*/
package org.apache.felix.http.whiteboard.internal;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.util.tracker.ServiceTracker;
import org.apache.felix.http.whiteboard.internal.tracker.FilterTracker;
import org.apache.felix.http.whiteboard.internal.tracker.HttpContextTracker;
@@ -23,16 +25,18 @@ import org.apache.felix.http.whiteboard.
import org.apache.felix.http.whiteboard.internal.tracker.HttpServiceTracker;
import org.apache.felix.http.whiteboard.internal.manager.ExtenderManagerImpl;
import org.apache.felix.http.whiteboard.internal.manager.ExtenderManager;
+import org.apache.felix.http.whiteboard.internal.manager.HttpWhiteboardWebConsolePlugin;
import org.apache.felix.http.base.internal.AbstractActivator;
import org.apache.felix.http.base.internal.logger.SystemLogger;
-
import java.util.ArrayList;
+import java.util.Hashtable;
public final class WhiteboardActivator
extends AbstractActivator
{
private final ArrayList<ServiceTracker> trackers;
private ExtenderManager manager;
+ private ServiceRegistration httpPlugin;
public WhiteboardActivator()
{
@@ -47,6 +51,14 @@ public final class WhiteboardActivator
addTracker(new FilterTracker(getBundleContext(), this.manager));
addTracker(new ServletTracker(getBundleContext(), this.manager));
addTracker(new HttpServiceTracker(getBundleContext(), this.manager));
+
+ HttpWhiteboardWebConsolePlugin plugin = new HttpWhiteboardWebConsolePlugin((ExtenderManagerImpl) this.manager);
+ Hashtable<String, Object> props = new Hashtable<String, Object>();
+ props.put("felix.webconsole.label", plugin.getLabel());
+ props.put("felix.webconsole.title", plugin.getTitle());
+ props.put(Constants.SERVICE_DESCRIPTION, "Felix Http Whiteboard WebConsole Plugin");
+ httpPlugin = getBundleContext().registerService("javax.servlet.Servlet", plugin, props);
+
SystemLogger.info("Http service whiteboard started");
}
@@ -59,6 +71,8 @@ public final class WhiteboardActivator
protected void doStop()
throws Exception
{
+ this.httpPlugin.unregister();
+
for (ServiceTracker tracker : this.trackers) {
tracker.close();
}
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/DefaultHttpContext.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/DefaultHttpContext.java?rev=1203903&r1=1203902&r2=1203903&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/DefaultHttpContext.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/DefaultHttpContext.java Fri Nov 18 23:46:04 2011
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import java.net.URL;
-public final class DefaultHttpContext
+public final class DefaultHttpContext
implements HttpContext
{
private Bundle bundle;
@@ -50,4 +50,10 @@ public final class DefaultHttpContext
{
return true;
}
+
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + " (" + Integer.toHexString(System.identityHashCode(this)) + ")";
+ }
}
\ No newline at end of file
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java?rev=1203903&r1=1203902&r2=1203903&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java Fri Nov 18 23:46:04 2011
@@ -18,6 +18,7 @@ package org.apache.felix.http.whiteboard
import java.util.Collection;
import java.util.HashMap;
+import java.util.Map;
import javax.servlet.Filter;
import javax.servlet.Servlet;
@@ -134,7 +135,7 @@ public final class ExtenderManagerImpl
return;
}
- ServletMapping mapping = new ServletMapping(getHttpContext(ref), service, alias);
+ ServletMapping mapping = new ServletMapping(getHttpContext(ref), service, alias);
addInitParams(ref, mapping);
addMapping(service, mapping);
}
@@ -213,4 +214,16 @@ public final class ExtenderManagerImpl
mapping.unregister(this.httpService);
}
}
+
+ Map<String, HttpContext> getHttpContexts() {
+ return this.contextManager.getHttpContexts();
+ }
+
+ Map<Object, AbstractMapping> getMappings()
+ {
+ synchronized (this)
+ {
+ return new HashMap<Object, AbstractMapping>(this.mapping);
+ }
+ }
}
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/FilterMapping.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/FilterMapping.java?rev=1203903&r1=1203902&r2=1203903&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/FilterMapping.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/FilterMapping.java Fri Nov 18 23:46:04 2011
@@ -38,9 +38,24 @@ public final class FilterMapping
this.ranking = ranking;
}
+ Filter getFilter()
+ {
+ return filter;
+ }
+
+ int getRanking()
+ {
+ return ranking;
+ }
+
+ String getPattern()
+ {
+ return pattern;
+ }
+
public void register(HttpService httpService)
- {
- if (httpService instanceof ExtHttpService) {
+ {
+ if (httpService instanceof ExtHttpService) {
register((ExtHttpService)httpService);
}
}
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java?rev=1203903&r1=1203902&r2=1203903&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java Fri Nov 18 23:46:04 2011
@@ -20,6 +20,7 @@ import org.osgi.framework.Bundle;
import org.osgi.service.http.HttpContext;
import org.apache.felix.http.base.internal.logger.SystemLogger;
import java.util.HashMap;
+import java.util.Map;
public final class HttpContextManager
{
@@ -48,7 +49,7 @@ public final class HttpContextManager
this.contextMap.put(context, id);
SystemLogger.debug("Added context with id [" + contextId + "]");
} else {
- SystemLogger.debug("Reusing context with id [" + contextId + "]");
+ SystemLogger.debug("Reusing context with id [" + contextId + "]");
}
return context;
@@ -68,4 +69,9 @@ public final class HttpContextManager
this.idMap.put(id, context);
this.contextMap.put(context, id);
}
+
+ public synchronized Map<String, HttpContext> getHttpContexts()
+ {
+ return new HashMap<String, HttpContext>(this.idMap);
+ }
}
Added: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpWhiteboardWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpWhiteboardWebConsolePlugin.java?rev=1203903&view=auto
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpWhiteboardWebConsolePlugin.java (added)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpWhiteboardWebConsolePlugin.java Fri Nov 18 23:46:04 2011
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.http.whiteboard.internal.manager;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.service.http.HttpContext;
+
+@SuppressWarnings("serial")
+public class HttpWhiteboardWebConsolePlugin extends HttpServlet
+{
+
+ private final ExtenderManagerImpl extMgr;
+
+ public String getLabel()
+ {
+ return "httpwhiteboard";
+ }
+
+ public String getTitle()
+ {
+ return "Http Whiteboard";
+ }
+
+ public HttpWhiteboardWebConsolePlugin(final ExtenderManagerImpl extMgr)
+ {
+ this.extMgr = extMgr;
+ }
+
+ @Override
+ protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ // only handle GET requests, ensure no error message for other requests
+ if ("GET".equals(req.getMethod()) || "HEAD".equals(req.getMethod()))
+ {
+ super.service(req, resp);
+ }
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
+ {
+
+ PrintWriter pw = resp.getWriter();
+
+ pw.println("<table class='content' width='100%' cellspacing='0' cellpadding='0'>");
+
+ printHttpContextServices(pw);
+
+ pw.println("<tr><td colspan='2'> </td></tr>");
+
+ final Map<Object, AbstractMapping> mappings = extMgr.getMappings();
+ printServletMappings(pw, mappings);
+
+ pw.println("<tr><td colspan='2'> </td></tr>");
+
+ printFilterMappings(pw, mappings);
+
+ pw.println("</table>");
+ }
+
+ private void printHttpContextServices(PrintWriter pw)
+ {
+ pw.println("<tr>");
+ pw.println("<th class='content container' colspan='4'>Registered HttpContext Services</td>");
+ pw.println("</tr>");
+ pw.println("<tr>");
+ pw.println("<th class='content'>Context ID</td>");
+ pw.println("<th class='content' colspan='3'>HttpContext</td>");
+ pw.println("</tr>");
+
+ final Map<String, HttpContext> contexts = extMgr.getHttpContexts();
+ for (Map.Entry<String, HttpContext> handler : contexts.entrySet())
+ {
+ pw.println("<tr class='content'>");
+ pw.println("<td class='content'>" + handler.getKey() + "</td>");
+ pw.println("<td class='content' colspan='3'>" + handler.getValue() + "</td>");
+ pw.println("</tr>");
+ }
+ }
+
+ private void printServletMappings(PrintWriter pw, Map<Object, AbstractMapping> mappings)
+ {
+ pw.println("<tr>");
+ pw.println("<th class='content container' colspan='4'>Registered Filter and Servlet Services</td>");
+ pw.println("</tr>");
+ pw.println("<tr>");
+ pw.println("<th class='content'>Alias</td>");
+ pw.println("<th class='content'>Servlet</td>");
+ pw.println("<th class='content'>Init Parameter</td>");
+ pw.println("<th class='content'>HttpContext</td>");
+ pw.println("</tr>");
+
+ for (Map.Entry<Object, AbstractMapping> handler : mappings.entrySet())
+ {
+ if (handler.getValue() instanceof ServletMapping)
+ {
+ ServletMapping sm = (ServletMapping) handler.getValue();
+ pw.println("<tr class='content'>");
+ pw.println("<td class='content'>" + sm.getAlias() + "</td>");
+ pw.println("<td class='content'>" + sm.getServlet() + "</td>");
+ pw.println("<td class='content'>" + sm.getInitParams() + "</td>");
+ pw.println("<td class='content'>" + sm.getContext() + "</td>");
+ pw.println("</tr>");
+ }
+ }
+ }
+
+ private void printFilterMappings(PrintWriter pw, Map<Object, AbstractMapping> mappings)
+ {
+ pw.println("<tr>");
+ pw.println("<th class='content container' colspan='4'>Registered Filter and Servlet Services</td>");
+ pw.println("</tr>");
+ pw.println("<tr>");
+ pw.println("<th class='content'>Pattern</td>");
+ pw.println("<th class='content'>Filter (Ranking)</td>");
+ pw.println("<th class='content'>Init Parameter</td>");
+ pw.println("<th class='content'>HttpContext</td>");
+ pw.println("</tr>");
+
+ for (Map.Entry<Object, AbstractMapping> handler : mappings.entrySet())
+ {
+ if (handler.getValue() instanceof FilterMapping)
+ {
+ FilterMapping fm = (FilterMapping) handler.getValue();
+ pw.println("<tr class='content'>");
+ pw.println("<td class='content'>" + fm.getPattern() + "</td>");
+ pw.println("<td class='content'>" + fm.getFilter() + " (" + fm.getRanking() + ")</td>");
+ pw.println("<td class='content'>" + fm.getInitParams() + "</td>");
+ pw.println("<td class='content'>" + fm.getContext() + "</td>");
+ pw.println("</tr>");
+ }
+ }
+ }
+
+}
Propchange: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpWhiteboardWebConsolePlugin.java
------------------------------------------------------------------------------
svn:executable = *
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ServletMapping.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ServletMapping.java?rev=1203903&r1=1203902&r2=1203903&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ServletMapping.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ServletMapping.java Fri Nov 18 23:46:04 2011
@@ -35,6 +35,16 @@ public final class ServletMapping
this.alias = alias;
}
+ String getAlias()
+ {
+ return this.alias;
+ }
+
+ Servlet getServlet()
+ {
+ return this.servlet;
+ }
+
public void register(HttpService httpService)
{
try {