Use HttpWhiteboard instead of extension point for NavServlet

Currently the help center uses equinox specific extension points to
register its servlets but there is actually a standard OSGi way to do so
with R7 the Http Whiteboard Service.

This migrates the NavServlet as a very first step to investigate if any
issues are to be discovered. If that works all other servlets should be
migrated as well.

Author: laeubi

ua/org.eclipse.help.webapp/.project

@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>

ua/org.eclipse.help.webapp/.settings/org.eclipse.pde.ds.annotations.prefs

@@ -0,0 +1,7 @@
+dsVersion=V1_4
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error

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

@@ -10,6 +10,7 @@ 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
 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,
@@ -19,6 +20,7 @@ Export-Package: org.eclipse.help.internal.webapp;x-friends:="org.eclipse.ua.test
  org.eclipse.help.webapp
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: javax.servlet;version="3.1.0",
- javax.servlet.http;version="3.1.0"
+ javax.servlet.http;version="3.1.0",
+ org.osgi.service.http.whiteboard.propertytypes;version="[1.1.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.help.webapp

ua/org.eclipse.help.webapp/OSGI-INF/.gitignore

@@ -0,0 +1 @@
+/*.xml

ua/org.eclipse.help.webapp/build.properties

@@ -24,7 +24,8 @@ bin.includes = plugin.xml,\
                advanced/,\
                .options,\
                advancedstate/,\
-               m/
+               m/,\
+               OSGI-INF/
 output.. = bin/
 javacWarnings..=-unavoidableGenericProblems
 

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

@@ -77,11 +77,6 @@
             class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
             httpcontextId="help">
       </servlet>
-      <servlet
-            alias="/nav"
-            class="org.eclipse.help.internal.webapp.servlet.NavServlet"
-            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/NavServlet.java

@@ -21,6 +21,7 @@
 import java.util.Locale;
 import java.util.StringTokenizer;
 
+import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -35,11 +36,17 @@
 import org.eclipse.help.internal.webapp.data.RequestScope;
 import org.eclipse.help.internal.webapp.data.UrlUtil;
 import org.eclipse.help.webapp.IFilter;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
 
 /*
  * Generates navigation pages where topics are not present in the table
  * of contents. Displays links to the direct child topics.
  */
+@Component(service = Servlet.class)
+@HttpWhiteboardServletName("nav")
+@HttpWhiteboardServletPattern("/nav/*")
 public class NavServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;