Convert ContentServlet to whiteboard

Author: laeubi

ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF

@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.help.base;bundle-version="[4.3.200,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100",
  org.eclipse.jdt.core.compiler.batch;bundle-version="[3.33.0,4.0.0)"
-Service-Component: OSGI-INF/org.eclipse.help.internal.webapp.servlet.NavServlet.xml
+Service-Component: OSGI-INF/org.eclipse.help.internal.webapp.servlet.ContentServlet.xml,
+ OSGI-INF/org.eclipse.help.internal.webapp.servlet.NavServlet.xml
 Export-Package: org.eclipse.help.internal.webapp;x-friends:="org.eclipse.ua.tests",
  org.eclipse.help.internal.webapp.data;x-friends:="org.eclipse.ua.tests",
  org.eclipse.help.internal.webapp.parser;x-internal:=true,

ua/org.eclipse.help.webapp/plugin.xml

@@ -52,31 +52,6 @@
             class="org.eclipse.help.internal.webapp.servlet.ControlServlet"
             httpcontextId="help">
       </servlet>
-      <servlet
-            alias="/content"
-            class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
-            httpcontextId="help">
-      </servlet>
-      <servlet
-            alias="/topic"
-            class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
-            httpcontextId="help">
-      </servlet>
-      <servlet
-            alias="/nftopic"
-            class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
-            httpcontextId="help">
-      </servlet>
-      <servlet
-            alias="/ntopic"
-            class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
-            httpcontextId="help">
-      </servlet>
-      <servlet
-            alias="/rtopic"
-            class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
-            httpcontextId="help">
-      </servlet>
       <servlet
             alias="/livehelp"
             class="org.eclipse.help.internal.webapp.servlet.LiveHelpServlet"

ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ContentServlet.java

@@ -15,15 +15,22 @@
 
 import java.io.IOException;
 
+import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.help.internal.base.BaseHelpSystem;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
 /**
  * Servlet to interface client with remote Eclipse
  */
+@Component(service = Servlet.class)
+@HttpWhiteboardServletName("content")
+@HttpWhiteboardServletPattern({ "/content/*", "/topic/*", "/nftopic/*", "/ntopic/*", "/rtopic/*" })
 public class ContentServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 	private EclipseConnector connector;