Bug 363009 - Refactor Infocenter deployment as webappY20200430-0210Y20200429-0730Y20200428-2310Y20200428-0250Y20200428-0140Y20200427-2330I20200509-1800I20200509-0600I20200509-0450I20200506-1800I20200505-1800I20200504-1800I20200503-1800I20200502-1800I20200501-1800I20200501-0520I20200429-1800I20200429-0600I20200428-2300I20200428-1800I20200428-0630I20200428-0610I20200428-0230I20200427-1800I20200426-1800I20200425-1800I20200424-1800I20200424-0540I20200423-1800I20200422-1800

This change refactors the approach to deploy the Eclipse information
center as web application on web application servers like Tomcat.

The previous approach involved several error prone manual steps. To
create a consistent OSGi application within the web archive the
application is now defined as Eclipse product and built with Tycho.

The web application is automatically assembled from the application
which makes it obsolete to manually search for a fitting version of the
servletbridge bundles and copying them to the application. All is done
within the application build.

This change refactors the project structure from root directory
'web-archive' to 'infocenter-web'.

A README.md file is provided with instructions for building the
infocenter application with the new approach.

Change-Id: I52ae067fd7eeccf669243942134ebac3904a3bb4
Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>

18 files changed, 373 insertions, 351 deletions

diff --git a/infocenter-web/.gitignore b/infocenter-web/.gitignore
new file mode 100644
index 000000000..0ea2344df
--- /dev/null
+++ b/infocenter-web/.gitignore
@@ -0,0 +1,5 @@
+bin
+target
+.settings
+.project
+.classpath
diff --git a/infocenter-web/README.md b/infocenter-web/README.md
new file mode 100644
index 000000000..1b5d4b105
--- /dev/null
+++ b/infocenter-web/README.md
@@ -0,0 +1,40 @@
+# Deploying the information center as a Web Archive
+
+Using Eclipse 3.4 or later it is possible to configure the help plugins to be deployed as a web archive (war file) which will act as a fully
+functioning information center. The instructions below assume a Tomcat server has been installed, but with minor modifications
+these steps should work for any full featured server.
+
+
+* Clone the eclipse.platform.ua repository
+  ``git clone https://git.eclipse.org/r/platform/eclipse.platform.ua.git``
+* In the Git repository locate the `infocenter-web` directory and underneath that there will be two directories titled `infocenter-app` and
+`infocenter-product`.
+* Make sure you have the "m2e - Maven Integration for Eclipse" feature installed in your Eclipse IDE.
+* Import the `infocenter-web` Maven project using File->Import->Existing Project.
+* Add some documentation plugins to the `infocenter-web/infocenter-app/src/main/webapp/WEB-INF/plugins` directory.
+* Register the plugins in `infocenter-web/infocenter-app/src/main/webapp/WEB-INF/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info`
+* Install required Maven POMs from Eclipse Platform:
+   ``git clone -q --depth 1 https://git.eclipse.org/r/platform/eclipse.platform.releng.aggregator && mvn install -N -f eclipse.platform.releng.aggregator/eclipse-platform-parent && mvn install -N -f eclipse.platform.releng.aggregator/eclipse.platform.releng.prereqs.sdk``
+* Execute a Maven build in `infocenter-web`
+** Either within Eclipse, right-click on `infocenter-build.launch` and select _Run As -> infocenter-build_
+** Or from command-line using the command `mvnw`
+* For Tomcat only. In `conf/server.xml` add `URIEncoding="UTF-8"` to the connector element, for example
+  ``<Connector port="8080" URIEncoding="UTF-8" etc.>``
+  If this step is not performed search will fail if the search term contains non ASCII characters.
+* Start Tomcat and see the help system start up. The default URL is <http://localhost:8080/help/>.
+
+
+Notes: If you look in the `config.ini` in the `help.war` file under directory `help/WEB_INF/configuration` you will notice the
+line `eclipse.product=org.eclipse.productname`. If your product has help system customizations in a product plugin you can
+activate these by changing this line to point to your product plugin.
+
+## Troubleshooting
+
+### HTTP 404 with Message "BridgeServlet: /help/"
+
+In the web.xml activate the init parameter `enableFrameworkControls`. This enables endpoints to control the embedded OSGi container. Call <http://localhost:8080/help/sp_test>.
+
+You should see the message "`Servlet delegate registered - org.eclipse.equinox.http.servlet.HttpServiceServlet`". You may instead see the message "`Servlet delegate not registered.`". 
+This indicates that bundle activator from bundle `org.eclipse.equinox.http.servletbridge` was not started or that it accesses a different instance of class `org.eclipse.equinox.servletbridge.BridgeServlet`.
+
+For all available framework control endpoints refer to `org.eclipse.equinox.servletbridge.BridgeServlet.serviceFrameworkControls(HttpServletRequest, HttpServletResponse)`.
diff --git a/infocenter-web/infocenter-app/pom.xml b/infocenter-web/infocenter-app/pom.xml
new file mode 100644
index 000000000..cb0fc6878
--- /dev/null
+++ b/infocenter-web/infocenter-app/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2020 Eclipse Foundation. All rights reserved. This program 
+	and the accompanying materials are made available under the terms of the 
+	Eclipse Distribution License v1.0 which accompanies this distribution, and 
+	is available at http://www.eclipse.org/org/documents/edl-v10.php Contributors: 
+	Karsten Thoms - initial implementation -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.help</groupId>
+		<artifactId>infocenter-parent</artifactId>
+		<version>4.16.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>infocenter-app</artifactId>
+	<packaging>war</packaging>
+	<build>
+		<finalName>help</finalName>
+		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>src/main/webapp/WEB-INF</directory>
+							<includes>
+								<include>configuration/**</include>
+								<include>lib/**</include>
+								<include>plugins/**</include>
+								<include>*.ini</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<?m2e ignore?>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<copy todir="src/main/webapp/WEB-INF">
+									<fileset
+										dir="../infocenter-product/target/products/infocenter/linux/gtk/x86_64/infocenter"
+										includes="**" excludes="artifacts.xml,p2/**"/>
+								</copy>
+								<copy todir="src/main/webapp/WEB-INF/lib">
+									<fileset dir="src/main/webapp/WEB-INF/plugins"
+										includes="*.equinox.servletbridge_*.jar" />
+								</copy>
+								<!-- org.eclipse.equinox.servletbridge.FrameworkLauncher.LAUNCH_INI -->
+								<move file="src/main/webapp/WEB-INF/eclipse.ini" tofile="src/main/webapp/WEB-INF/launch.ini"/>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/infocenter-web/infocenter-app/src/main/webapp/WEB-INF/.gitignore b/infocenter-web/infocenter-app/src/main/webapp/WEB-INF/.gitignore
new file mode 100644
index 000000000..2c10d0ea3
--- /dev/null
+++ b/infocenter-web/infocenter-app/src/main/webapp/WEB-INF/.gitignore
@@ -0,0 +1,7 @@
+/artifacts.xml
+/configuration/
+/eclipse.ini
+/p2/
+/plugins/
+/lib/
+/launch.ini
diff --git a/infocenter-web/infocenter-app/src/main/webapp/WEB-INF/web.xml b/infocenter-web/infocenter-app/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..59d2a5d89
--- /dev/null
+++ b/infocenter-web/infocenter-app/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2005, 2020 IBM Corporation and others. This program and 
+	the accompanying materials are made available under the terms of the Eclipse 
+	Public License 2.0 which accompanies this distribution, and is available 
+	at https://www.eclipse.org/legal/epl-2.0/ SPDX-License-Identifier: EPL-2.0 
+	Contributors: IBM Corporation - initial API and implementation -->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+	      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
+	<servlet>
+		<servlet-name>equinoxbridgeservlet</servlet-name>
+		<servlet-class>org.eclipse.equinox.servletbridge.BridgeServlet</servlet-class>
+		<!-- org.eclipse.equinox.servletbridge and the Servlet API are exported 
+			automatically to the underlying OSGi framework. The extendedFrameworkExports 
+			parameter allows the specification of additional java package exports. The 
+			format is a comma separated list of exports as specified by the "Export-Package" 
+			bundle manifest header. For example: com.mycompany.exports; version=1.0.0, 
+			com.mycompany.otherexports; version=1.0.0 -->
+		<init-param>
+			<param-name>extendedFrameworkExports</param-name>
+			<param-value></param-value>
+		</init-param>
+
+		<!-- You can specify your own framework launcher here. The default is: 
+			org.eclipse.equinox.servletbridge.FrameworkLauncher <init-param> <param-name>frameworkLauncherClass</param-name> 
+			<param-value>org.eclipse.equinox.servletbridge.FrameworkLauncher</param-value> 
+			</init-param> -->
+		<!-- Uncommenting this section will enable the OSGI debugging prompt -->
+		<init-param>
+			<param-name>commandline</param-name>
+			<param-value>-console</param-value>
+		</init-param>
+		<init-param>
+			<param-name>other.info</param-name>
+			<param-value>org.eclipse.help</param-value>
+		</init-param>
+		<init-param>
+			<param-name>enableFrameworkControls</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>equinoxbridgeservlet</servlet-name>
+		<url-pattern>/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>equinoxbridgeservlet</servlet-name>
+		<url-pattern>*.jsp</url-pattern>
+	</servlet-mapping>
+	<welcome-file-list>
+		<welcome-file>index.jsp</welcome-file>
+	</welcome-file-list>
+</web-app>
diff --git a/infocenter-web/infocenter-build.launch b/infocenter-web/infocenter-build.launch
new file mode 100644
index 000000000..b9ba48e03
--- /dev/null
+++ b/infocenter-web/infocenter-build.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value=""/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/infocenter-web&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/infocenter-web}"/>
+</launchConfiguration>
diff --git a/infocenter-web/infocenter-product/infocenter.product b/infocenter-web/infocenter-product/infocenter.product
new file mode 100644
index 000000000..e2ad62060
--- /dev/null
+++ b/infocenter-web/infocenter-product/infocenter.product
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Eclipse Infocenter Application" uid="infocenter" application="org.eclipse.help.base.infocenterApplication" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>osgi.*=@null
+org.osgi.*=@null
+eclipse.*=@null
+
+osgi.parentClassloader=fwk
+osgi.contextClassLoaderParent=fwk
+org.osgi.framework.bootdelegation=*
+      </programArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <launcher name="launch">
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
+   </vm>
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="javax.el"/>
+      <plugin id="javax.servlet"/>
+      <plugin id="javax.servlet.jsp"/>
+      <plugin id="javax.xml"/>
+      <plugin id="org.apache.felix.scr"/>
+      <plugin id="org.apache.jasper.glassfish"/>
+      <plugin id="org.apache.lucene.analyzers-common"/>
+      <plugin id="org.apache.lucene.analyzers-smartcn"/>
+      <plugin id="org.apache.lucene.core"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.net"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.event"/>
+      <plugin id="org.eclipse.equinox.http.registry"/>
+      <plugin id="org.eclipse.equinox.http.servlet"/>
+      <plugin id="org.eclipse.equinox.http.servletbridge"/>
+      <plugin id="org.eclipse.equinox.jsp.jasper"/>
+      <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.security"/>
+      <plugin id="org.eclipse.equinox.servletbridge"/>
+      <plugin id="org.eclipse.equinox.simpleconfigurator"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.help.base"/>
+      <plugin id="org.eclipse.help.webapp"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.util"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.help.webapp" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
+      <property name="eclipse.product" value="org.eclipse.productname" />
+   </configurations>
+
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
+</product>
diff --git a/infocenter-web/infocenter-product/pom.xml b/infocenter-web/infocenter-product/pom.xml
new file mode 100644
index 000000000..97dccf0b7
--- /dev/null
+++ b/infocenter-web/infocenter-product/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2020 Eclipse Foundation. All rights reserved. This program 
+	and the accompanying materials are made available under the terms of the 
+	Eclipse Distribution License v1.0 which accompanies this distribution, and 
+	is available at http://www.eclipse.org/org/documents/edl-v10.php Contributors: 
+	Karsten Thoms - initial implementation -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.help</groupId>
+		<artifactId>infocenter-parent</artifactId>
+		<version>4.16.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>infocenter-product</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create-distributions</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<products>
+						<product>
+							<id>infocenter</id>
+							<rootFolder>infocenter</rootFolder>
+						</product>
+					</products>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/infocenter-web/pom.xml b/infocenter-web/pom.xml
new file mode 100644
index 000000000..947912c23
--- /dev/null
+++ b/infocenter-web/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2020 Eclipse Foundation. All rights reserved. This program 
+	and the accompanying materials are made available under the terms of the 
+	Eclipse Distribution License v1.0 which accompanies this distribution, and 
+	is available at http://www.eclipse.org/org/documents/edl-v10.php Contributors: 
+	Karsten Thoms - initial implementation -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse</groupId>
+		<artifactId>eclipse-platform-parent</artifactId>
+		<version>4.16.0-SNAPSHOT</version>
+		<relativePath>../../eclipse-platform-parent</relativePath>
+	</parent>
+	<groupId>org.eclipse.help</groupId>
+	<artifactId>infocenter-parent</artifactId>
+	<packaging>pom</packaging>
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+	<modules>
+		<module>infocenter-product</module>
+		<module>infocenter-app</module>
+	</modules>
+	<build>
+		<defaultGoal>clean verify</defaultGoal>
+	</build>
+</project>
diff --git a/org.eclipse.help.webapp/build.properties b/org.eclipse.help.webapp/build.properties
index 47f6b1e8b..2c55ef6b3 100644
--- a/org.eclipse.help.webapp/build.properties
+++ b/org.eclipse.help.webapp/build.properties
@@ -24,7 +24,6 @@ bin.includes = plugin.xml,\
                index.jsp,\
                advanced/,\
                .options,\
-               web-archive/,\
                advancedstate/
 output.. = bin/
 javacWarnings..=-unavoidableGenericProblems
diff --git a/org.eclipse.help.webapp/web-archive/help/META-INF/MANIFEST.MF b/org.eclipse.help.webapp/web-archive/help/META-INF/MANIFEST.MF
deleted file mode 100644
index b800d9f50..000000000
--- a/org.eclipse.help.webapp/web-archive/help/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-
-
diff --git a/org.eclipse.help.webapp/web-archive/help/WEB-INF/configuration/config.ini b/org.eclipse.help.webapp/web-archive/help/WEB-INF/configuration/config.ini
deleted file mode 100644
index 6cbbad2bb..000000000
--- a/org.eclipse.help.webapp/web-archive/help/WEB-INF/configuration/config.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-#Eclipse Runtime Configuration File
-#Substitute the product name below with the name of your product plugin if you want to be able to 
-#customize the help appearance
-eclipse.product=org.eclipse.productname
-osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.equinox.http.servletbridge@start,org.eclipse.equinox.http.registry@start, org.eclipse.help.webapp@start
-osgi.bundles.defaultStartLevel=4
diff --git a/org.eclipse.help.webapp/web-archive/help/WEB-INF/launch.ini b/org.eclipse.help.webapp/web-archive/help/WEB-INF/launch.ini
deleted file mode 100644
index a96f99e95..000000000
--- a/org.eclipse.help.webapp/web-archive/help/WEB-INF/launch.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# Eclipse Runtime Configuration Overrides
-# These properties are loaded prior to starting the framework and can also be used to override System Properties
-# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
-# "*" can be used together with @null to clear System Properties that match a prefix name. 
-
-osgi.*=@null
-org.osgi.*=@null
-eclipse.*=@null
-
-osgi.parentClassloader=app
-osgi.contextClassLoaderParent=app
diff --git a/org.eclipse.help.webapp/web-archive/help/WEB-INF/web.xml b/org.eclipse.help.webapp/web-archive/help/WEB-INF/web.xml
deleted file mode 100644
index 012247132..000000000
--- a/org.eclipse.help.webapp/web-archive/help/WEB-INF/web.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-
-     This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License 2.0
-     which accompanies this distribution, and is available at
-     https://www.eclipse.org/legal/epl-2.0/
-
-     SPDX-License-Identifier: EPL-2.0
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-<web-app id="WebApp">
-	<servlet id="iehs">
-		<servlet-name>equinoxbridgeservlet</servlet-name>
-		<display-name>Equinox Bridge Servlet</display-name>
-		<description>Equinox Bridge Servlet</description>
-		<servlet-class>org.eclipse.equinox.servletbridge.BridgeServlet</servlet-class>
-		<!--
-		  org.eclipse.equinox.servletbridge and the Servlet API are exported automatically to the underlying OSGi framework.
-		  The extendedFrameworkExports parameter allows the specification of additional java package exports.
-		  The format is a comma separated list of exports as specified by the "Export-Package" bundle manifest header.
-		  For example: com.mycompany.exports; version=1.0.0, com.mycompany.otherexports; version=1.0.0
-		  -->
-		<init-param>
-			<param-name>extendedFrameworkExports</param-name>
-			<param-value></param-value>			
-		</init-param>
-
-		<!-- 
-		  You can specify your own framework launcher here.
-		  The default is: org.eclipse.equinox.servletbridge.FrameworkLauncher
-		<init-param>
-			<param-name>frameworkLauncherClass</param-name>
-			<param-value>org.eclipse.equinox.servletbridge.FrameworkLauncher</param-value>
-		</init-param>	
-		-->	  
-		<!--  
-		Uncommenting this section will enable the OSGI debugging prompt       
-        <init-param>
-			<param-name>commandline</param-name>
-			<param-value>-console</param-value>			
-		</init-param>
-		-->	           
-        <init-param>
-			<param-name>other.info</param-name>
-			<param-value>org.eclipse.help</param-value>			
-		</init-param>			
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>equinoxbridgeservlet</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>equinoxbridgeservlet</servlet-name>
-		<url-pattern>*.jsp</url-pattern>
-	</servlet-mapping>
-</web-app>
diff --git a/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/.project b/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/.project
deleted file mode 100644
index 2e032d05f..000000000
--- a/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.help.infocenter-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/build.properties b/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/build.properties
deleted file mode 100644
index 206adc00f..000000000
--- a/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-#  Copyright (c) 2005, 2008 IBM Corporation and others.
-#
-#  This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License 2.0
-#  which accompanies this distribution, and is available at
-#  https://www.eclipse.org/legal/epl-2.0/
-#
-#  SPDX-License-Identifier: EPL-2.0
-# 
-#  Contributors:
-#      IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml
diff --git a/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/feature.xml b/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/feature.xml
deleted file mode 100644
index 507a6506b..000000000
--- a/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/feature.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2008, 2015 IBM Corporation and others.
-
-    This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-    
-    Contributors:
-        IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.help.infocenter_feature"
-      label="Infocenter_feature Feature"
-      version="1.0.0">
-
-   <description>
-      This feature contains all of the plugins required to create a
-war file of the help infocenter with the exception of the servlet
-bridge.
-   </description>
-
-   <copyright>
-      Copyright (c) 2007 IBM Corporation and others.
-
-This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-https://www.eclipse.org/legal/epl-2.0/
-
-SPDX-License-Identifier: EPL-2.0
-Contributors:
-IBM Corporation - initial API and implementation
-   </copyright>
-
-   <plugin
-         id="com.ibm.icu"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet.jsp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.el"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.jasper"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.contenttype"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.expressions"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.jobs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.app"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.jetty"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jsp.jasper"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jsp.jasper.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.preferences"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.jcraft.jsch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.webapp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.analyzers-common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.analyzers-smartcn"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/pom.xml b/pom.xml
index 9ac1722ce..8aac2bd00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,5 +69,6 @@
     <module>org.eclipse.tips.json</module>
     <module>org.eclipse.tips.feature</module>
     
+    <module>infocenter-web</module>
   </modules>
 </project>