merging RCPv20031105_RCPmerged

29 files changed, 202 insertions, 187 deletions

diff --git a/org.eclipse.help.webapp/.classpath b/org.eclipse.help.webapp/.classpath
index bda2965b3..465feb235 100644
--- a/org.eclipse.help.webapp/.classpath
+++ b/org.eclipse.help.webapp/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src_servlets"/>
+    <classpathentry kind="src" output="WEB-INF/classes" path="src_servlets"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.help.webapp/.cvsignore b/org.eclipse.help.webapp/.cvsignore
index d9d8f3fbd..592c6ece7 100644
--- a/org.eclipse.help.webapp/.cvsignore
+++ b/org.eclipse.help.webapp/.cvsignore
@@ -4,3 +4,4 @@ webapp.jar.bin.log
 temp.folder
 jsp.jar
 webapp.jar
+webappsrc.zip
diff --git a/org.eclipse.help.webapp/.project b/org.eclipse.help.webapp/.project
index b1c49af50..ee3a4c204 100644
--- a/org.eclipse.help.webapp/.project
+++ b/org.eclipse.help.webapp/.project
@@ -5,7 +5,7 @@
 	<projects>
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.help</project>
+		<project>org.eclipse.help.base</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore b/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
index 740c9a106..3adad4940 100644
--- a/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
+++ b/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
@@ -1,2 +1,3 @@
 jsp.jar
 servlets.jar
+servletssrc.zip
diff --git a/org.eclipse.help.webapp/WEB-INF/web.xml b/org.eclipse.help.webapp/WEB-INF/web.xml
index 631f15d8d..2e6a8b443 100644
--- a/org.eclipse.help.webapp/WEB-INF/web.xml
+++ b/org.eclipse.help.webapp/WEB-INF/web.xml
@@ -53,6 +53,11 @@
         <servlet-name>content</servlet-name>
         <url-pattern>/topic/*</url-pattern>
     </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>content</servlet-name>
+        <url-pattern>/nftopic/*</url-pattern>
+    </servlet-mapping>
     
     <servlet-mapping>
         <servlet-name>livehelp</servlet-name>
diff --git a/org.eclipse.help.webapp/basic/advanced.inc b/org.eclipse.help.webapp/basic/advanced.inc
index 53412b589..e7bb61f3d 100644
--- a/org.eclipse.help.webapp/basic/advanced.inc
+++ b/org.eclipse.help.webapp/basic/advanced.inc
@@ -18,7 +18,7 @@
 		</tr>
 		<tr>
 			<td nowrap>
-				<input type="text" name="searchWord" id="searchWord" value='<%=data.getSearchWord()%>' maxlength=256 alt='<%=ServletResources.getString("SearchExpression", request)%>' title='<%=ServletResources.getString("SearchExpression", request)%>>
+				<input type="text" name="searchWord" id="searchWord" value='<%=data.getSearchWord()%>' maxlength=256 alt='<%=ServletResources.getString("SearchExpression", request)%>' title='<%=ServletResources.getString("SearchExpression", request)%>'>
           	  	<input type="hidden" name="maxHits" value="500" >
           	  	<input type="hidden" name="scopedSearch" value="true" >
 				<input type="submit" value='<%=ServletResources.getString("GO", request)%>' alt='<%=ServletResources.getString("GO", request)%>' title='<%=ServletResources.getString("GO", request)%>'>
diff --git a/org.eclipse.help.webapp/build.xml b/org.eclipse.help.webapp/build.xml
index d62808012..8e37c88b0 100644
--- a/org.eclipse.help.webapp/build.xml
+++ b/org.eclipse.help.webapp/build.xml
@@ -2,14 +2,17 @@
 <project name="org.eclipse.help.webapp" default="build.jars" basedir=".">
 
 	<property name="bootclasspath" value=""/>
-	<property name="ws" value="win32"/>
-	<property name="os" value="win32"/>
-	<property name="arch" value="x86"/>
+	<property name="basews" value="${ws}"/>
+	<property name="baseos" value="${os}"/>
+	<property name="basearch" value="${arch}"/>
+	<property name="basenl" value="${nl}"/>
+	<property name="javacFailOnError" value="false"/>
+	<property name="javacDebugInfo" value="on"/>
+	<property name="javacVerbose" value="true"/>
+	<property name="javacSource" value="1.3"/>
+	<property name="javacTarget" value="1.1"/>
 
 	<target name="init" depends="properties">
-		<property name="plugin" value="org.eclipse.help.webapp"/>
-		<property name="version.suffix" value="_3.0.0"/>
-		<property name="full.name" value="${plugin}${version.suffix}"/>
 		<property name="temp.folder" value="${basedir}/temp.folder"/>
 		<property name="plugin.destination" value="${basedir}"/>
 		<property name="build.result.folder" value="${basedir}"/>
@@ -19,52 +22,50 @@
 		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
 	</target>
 
-	<target name="build.update.jar" depends="init">
+	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.help.webapp for an update site.">
 		<delete dir="${temp.folder}"/>
 		<mkdir dir="${temp.folder}"/>
 		<antcall target="build.jars"/>
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
+		<zip zipfile="${plugin.destination}/org.eclipse.help.webapp_3.0.0.jar" basedir="${temp.folder}/org.eclipse.help.webapp_3.0.0" filesonly="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<mkdir dir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
-		<copy file="${build.result.folder}/WEB-INF/lib/servlets.jar" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
-		<copy file="${build.result.folder}/WEB-INF/lib/jsp.jar" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
-		<copy file="${build.result.folder}/webapp.jar" todir="${destination.temp.folder}/${full.name}"/>
-		<copy todir="${destination.temp.folder}/${full.name}">
-			<fileset dir="${basedir}" includes="advanced/,basic/,WEB-INF/,*.html,*.jsp,plugin.properties,plugin.xml,.options" excludes="WEB-INF/classes/"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0">
+			<fileset dir="${build.result.folder}" includes="advanced/,basic/,WEB-INF/,*.html,*.jar,*.jsp,plugin.properties,plugin.xml,.options" excludes="WEB-INF/classes/"			/>
+		</copy>
+		<copy todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0">
+			<fileset dir="${basedir}" includes="advanced/,basic/,WEB-INF/,*.html,*.jar,*.jsp,plugin.properties,plugin.xml,.options" excludes="WEB-INF/classes/"			/>
 		</copy>
 <!-- custom begin -->
 		<loadfile
 			property="web.xml.fragment"
 			srcFile="${temp.folder}/jsp.jar.src/web.xml.fragment"/>
 		<replace
-			file="${destination.temp.folder}/${full.name}/WEB-INF/web.xml"
+			file="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0/WEB-INF/web.xml"
 			token="&lt;!-- placeholder for JSPs web.xml --&gt;"
 			value="${web.xml.fragment}"
 			encoding="ISO-8859-1" />
 <!-- custom end -->
 	</target>
 
-	<target name="webapp.jar" depends="init" unless="webapp.jar">
-		<property name="destdir" value="${temp.folder}/webapp.jar.bin"/>
+	<target name="webapp.jar" depends="init" unless="webapp.jar" description="Create jar: webapp.jar.">
 		<delete dir="${temp.folder}/webapp.jar.bin"/>
 		<mkdir dir="${temp.folder}/webapp.jar.bin"/>
 		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/webapp.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.runtime/runtime.jar;../org.eclipse.help/help.jar;../org.eclipse.help/bin;../org.eclipse.core.runtime/bin;../org.eclipse.core.boot/boot.jar;../org.eclipse.tomcat/servlet.jar;../org.eclipse.tomcat/jasper-runtime.jar;../org.eclipse.core.boot/bin">
-			<src path="src/"/>
+		<javac destdir="${temp.folder}/webapp.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;../org.eclipse.tomcat/servlet.jar;../org.eclipse.tomcat/jasper-runtime.jar;../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.apache.xerces/bin;../org.apache.xerces/xmlParserAPIs.jar;../org.apache.xerces/xercesImpl.jar;../org.eclipse.help.base/bin;../org.eclipse.help.base/helpbase.jar;../org.apache.lucene/bin;../org.apache.lucene/parser.jar;../org.apache.lucene/lucene-1.2.jar;../org.eclipse.help/bin;../org.eclipse.help/help.jar;../org.eclipse.help.appserver/bin;../org.eclipse.help.appserver/appserver.jar" source="${javacSource}" target="${javacTarget}"		>
+			<src path="src/"			/>
 		</javac>
 		<!-- copy necessary resources -->
 		<copy todir="${temp.folder}/webapp.jar.bin">
-			<fileset dir="src/" excludes="**/*.java"/>
+			<fileset dir="src/" excludes="**/*.java"			/>
 		</copy>
 <!-- custom begin -->
-		<copy file="${temp.folder}/webapp.jar.bin/webapp.properties" tofile="${temp.folder}/webapp.jar.bin/webapp_en.properties" />
+		<copy file="${temp.folder}/webapp.jar.bin/org/eclipse/help/internal/webapp/WebappResources.properties" tofile="${temp.folder}/webapp.jar.bin/org/eclipse/help/internal/webapp/WebappResources_en.properties" />
 <!-- custom end -->
 		<mkdir dir="${build.result.folder}"/>
 		<jar jarfile="${build.result.folder}/webapp.jar" basedir="${temp.folder}/webapp.jar.bin"/>
@@ -74,21 +75,20 @@
 	<target name="webappsrc.zip" depends="init" unless="webappsrc.zip">
 		<mkdir dir="${build.result.folder}"/>
 		<zip zipfile="${build.result.folder}/webappsrc.zip" filesonly="false">
-			<fileset dir="src/" includes="**/*.java"/>
+			<fileset dir="src/" includes="**/*.java"			/>
 		</zip>
 	</target>
 
-	<target name="WEB-INF/lib/servlets.jar" depends="init" unless="WEB-INF/lib/servlets.jar">
-		<property name="destdir" value="${temp.folder}/WEB-INF/lib/servlets.jar.bin"/>
+	<target name="WEB-INF/lib/servlets.jar" depends="init" unless="WEB-INF/lib/servlets.jar" description="Create jar: WEB-INF/lib/servlets.jar.">
 		<delete dir="${temp.folder}/WEB-INF/lib/servlets.jar.bin"/>
 		<mkdir dir="${temp.folder}/WEB-INF/lib/servlets.jar.bin"/>
 		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/WEB-INF/lib/servlets.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.runtime/runtime.jar;../org.eclipse.help/help.jar;webapp.jar;../org.eclipse.help/bin;../org.eclipse.core.runtime/bin;../org.eclipse.core.boot/boot.jar;../org.eclipse.tomcat/servlet.jar;../org.eclipse.tomcat/jasper-runtime.jar;../org.eclipse.core.boot/bin">
-			<src path="src_servlets/"/>
+		<javac destdir="${temp.folder}/WEB-INF/lib/servlets.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;bin;webapp.jar;../org.eclipse.tomcat/servlet.jar;../org.eclipse.tomcat/jasper-runtime.jar;../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.apache.xerces/bin;../org.apache.xerces/xmlParserAPIs.jar;../org.apache.xerces/xercesImpl.jar;../org.eclipse.help.base/bin;../org.eclipse.help.base/helpbase.jar;../org.apache.lucene/bin;../org.apache.lucene/parser.jar;../org.apache.lucene/lucene-1.2.jar;../org.eclipse.help/bin;../org.eclipse.help/help.jar;../org.eclipse.help.appserver/bin;../org.eclipse.help.appserver/appserver.jar" source="${javacSource}" target="${javacTarget}"		>
+			<src path="src_servlets/"			/>
 		</javac>
 		<!-- copy necessary resources -->
 		<copy todir="${temp.folder}/WEB-INF/lib/servlets.jar.bin">
-			<fileset dir="src_servlets/" excludes="**/*.java"/>
+			<fileset dir="src_servlets/" excludes="**/*.java"			/>
 		</copy>
 		<mkdir dir="${build.result.folder}/WEB-INF/lib"/>
 		<jar jarfile="${build.result.folder}/WEB-INF/lib/servlets.jar" basedir="${temp.folder}/WEB-INF/lib/servlets.jar.bin"/>
@@ -98,12 +98,11 @@
 	<target name="WEB-INF/lib/servletssrc.zip" depends="init" unless="WEB-INF/lib/servletssrc.zip">
 		<mkdir dir="${build.result.folder}/WEB-INF/lib"/>
 		<zip zipfile="${build.result.folder}/WEB-INF/lib/servletssrc.zip" filesonly="false">
-			<fileset dir="src_servlets/" includes="**/*.java"/>
+			<fileset dir="src_servlets/" includes="**/*.java"			/>
 		</zip>
 	</target>
 
-	<target name="WEB-INF/lib/jsp.jar" depends="init" unless="WEB-INF/lib/jsp.jar">
-		<property name="destdir" value="${temp.folder}/WEB-INF/lib/jsp.jar.bin"/>
+	<target name="WEB-INF/lib/jsp.jar" depends="init" unless="WEB-INF/lib/jsp.jar" description="Create jar: WEB-INF/lib/jsp.jar.">
 		<delete dir="${temp.folder}/WEB-INF/lib/jsp.jar.bin"/>
 		<mkdir dir="${temp.folder}/WEB-INF/lib/jsp.jar.bin"/>
 <!-- custom begin -->
@@ -133,12 +132,12 @@
 		</java>
 <!-- custom end -->	
 		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/WEB-INF/lib/jsp.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.runtime/runtime.jar;../org.eclipse.help/help.jar;webapp.jar;../org.eclipse.help/bin;../org.eclipse.core.runtime/bin;../org.eclipse.core.boot/boot.jar;WEB-INF/lib/servlets.jar;../org.eclipse.tomcat/servlet.jar;../org.eclipse.tomcat/jasper-runtime.jar;../org.eclipse.core.boot/bin">
-			<src path="${temp.folder}/jsp.jar.src/"/>
+		<javac destdir="${temp.folder}/WEB-INF/lib/jsp.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;bin;webapp.jar;WEB-INF/lib/servlets.jar;../org.eclipse.tomcat/servlet.jar;../org.eclipse.tomcat/jasper-runtime.jar;../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.apache.xerces/bin;../org.apache.xerces/xmlParserAPIs.jar;../org.apache.xerces/xercesImpl.jar;../org.eclipse.help.base/bin;../org.eclipse.help.base/helpbase.jar;../org.apache.lucene/bin;../org.apache.lucene/parser.jar;../org.apache.lucene/lucene-1.2.jar;../org.eclipse.help/bin;../org.eclipse.help/help.jar;../org.eclipse.help.appserver/bin;../org.eclipse.help.appserver/appserver.jar" source="${javacSource}" target="${javacTarget}"		>
+			<src path="${temp.folder}/jsp.jar.src/"			/>
 		</javac>
 		<!-- copy necessary resources -->
 		<copy todir="${temp.folder}/WEB-INF/lib/jsp.jar.bin">
-			<fileset dir="${temp.folder}/jsp.jar.src/" excludes="**/*.java"/>
+			<fileset dir="${temp.folder}/jsp.jar.src/" excludes="**/*.java"			/>
 		</copy>
 		<mkdir dir="${build.result.folder}/WEB-INF/lib"/>
 		<jar jarfile="${build.result.folder}/WEB-INF/lib/jsp.jar" basedir="${temp.folder}/WEB-INF/lib/jsp.jar.bin"/>
@@ -148,11 +147,11 @@
 	<target name="WEB-INF/lib/jspsrc.zip" depends="init" unless="WEB-INF/lib/jspsrc.zip">
 		<mkdir dir="${build.result.folder}/WEB-INF/lib"/>
 		<zip zipfile="${build.result.folder}/WEB-INF/lib/jspsrc.zip" filesonly="false">
-			<fileset dir="${temp.folder}/jsp.jar.src/" includes="**/*.java"/>
+			<fileset dir="${temp.folder}/jsp.jar.src/" includes="**/*.java"			/>
 		</zip>
 	</target>
 
-	<target name="build.jars" depends="init">
+	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.help.webapp.">
 		<available property="webapp.jar" file="${build.result.folder}/webapp.jar"/>
 		<antcall target="webapp.jar"/>
 		<available property="WEB-INF/lib/servlets.jar" file="${build.result.folder}/WEB-INF/lib/servlets.jar"/>
@@ -174,49 +173,50 @@
 <!-- custom end -->
 	</target>
 
-		<target name="build.zips" depends="init">
-		</target>
+	<target name="build.zips" depends="init">
+	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
-		<copy file="${build.result.folder}/WEB-INF/lib/servletssrc.zip" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0/WEB-INF/lib"/>
+		<copy file="${build.result.folder}/WEB-INF/lib/servletssrc.zip" todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0/WEB-INF/lib"/>
 <!-- custom begin -->
 <!--
-		<copy file="${build.result.folder}/WEB-INF/lib/jspsrc.zip" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
+		<copy file="${build.result.folder}/WEB-INF/lib/jspsrc.zip" todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0/WEB-INF/lib"/>
 -->
 <!-- custom end -->
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${build.result.folder}/webappsrc.zip" todir="${destination.temp.folder}/${full.name}"/>
-		<copy todir="${destination.temp.folder}/${full.name}">
-			<fileset dir="${basedir}" includes="about.html"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0"/>
+		<copy file="${build.result.folder}/webappsrc.zip" todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0">
+			<fileset dir="${basedir}" includes="about.html"			/>
 		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
-		<copy file="${temp.folder}/WEB-INF/lib/servlets.jar.bin.log" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
-		<copy file="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${temp.folder}/webapp.jar.bin.log" todir="${destination.temp.folder}/${full.name}"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0/WEB-INF/lib"/>
+		<copy file="${temp.folder}/WEB-INF/lib/servlets.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0/WEB-INF/lib"/>
+		<copy file="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0/WEB-INF/lib"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0"/>
+		<copy file="${temp.folder}/webapp.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.help.webapp_3.0.0"/>
 	</target>
 
-	<target name="clean" depends="init">
+	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.help.webapp of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/WEB-INF/lib/servlets.jar"/>
 		<delete file="${build.result.folder}/WEB-INF/lib/servletssrc.zip"/>
 		<delete file="${build.result.folder}/WEB-INF/lib/jsp.jar"/>
 		<delete file="${build.result.folder}/WEB-INF/lib/jspsrc.zip"/>
 		<delete file="${build.result.folder}/webapp.jar"/>
 		<delete file="${build.result.folder}/webappsrc.zip"/>
-		<delete file="${plugin.destination}/${full.name}.jar"/>
-		<delete file="${plugin.destination}/${full.name}.zip"/>
+		<delete file="${plugin.destination}/org.eclipse.help.webapp_3.0.0.jar"/>
+		<delete file="${plugin.destination}/org.eclipse.help.webapp_3.0.0.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
-	<target name="refresh" depends="init" if="eclipse.running">
-		<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
+	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+		<eclipse.convertPath fileSystemPath="d:/workspaceUpdate/plugins/org.eclipse.help.webapp/" property="resourcePath"/>
+		<eclipse.refreshLocal resource="org.eclipse.help.webapp" depth="infinite"/>
 	</target>
 
-	<target name="zip.plugin" depends="init">
+	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.help.webapp.">
 		<delete dir="${temp.folder}"/>
 		<mkdir dir="${temp.folder}"/>
 		<antcall target="build.jars"/>
@@ -228,9 +228,9 @@
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
 		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.log"/>
+			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
+		<zip zipfile="${plugin.destination}/org.eclipse.help.webapp_3.0.0.zip" basedir="${temp.folder}" filesonly="true"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
diff --git a/org.eclipse.help.webapp/plugin.properties b/org.eclipse.help.webapp/plugin.properties
index 9e8761d8d..f8be5ef8e 100644
--- a/org.eclipse.help.webapp/plugin.properties
+++ b/org.eclipse.help.webapp/plugin.properties
@@ -8,11 +8,7 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-help_plugin_name = Help System Webapp
+help_webapp_plugin_name = Help System Webapp
 providerName=Eclipse.org
-helpcontents = Browse &Help Contents
-help = Help
-help_view = Help
-openhelpcontents = Open Help Contents
 
 
diff --git a/org.eclipse.help.webapp/plugin.xml b/org.eclipse.help.webapp/plugin.xml
index a0d2cdb75..4e7ad58ec 100644
--- a/org.eclipse.help.webapp/plugin.xml
+++ b/org.eclipse.help.webapp/plugin.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.help.webapp"
-   name="%help_plugin_name"
+   name="%help_webapp_plugin_name"
    version="3.0.0"
    provider-name="%providerName"
    class="org.eclipse.help.internal.webapp.HelpWebappPlugin">
@@ -12,12 +13,12 @@
       </library>
    </runtime>
    <requires>
-      <import plugin="org.eclipse.help"/>
+      <import plugin="org.eclipse.help.base"/>
    </requires>
 
 
    <extension
-         point="org.eclipse.help.webapp">
+         point="org.eclipse.help.base.webapp">
       <webapp
             default="true">
       </webapp>
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java
index 80e62304a..3e3d2a68e 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java
@@ -23,12 +23,6 @@ public class WebappResources {
 
 	// resource bundles indexed by locale
 	private static HashMap resourceBundleTable = new HashMap();
-	/**
-	 * Resources constructor.
-	 */
-	protected WebappResources() {
-		super();
-	}
 
 	/**
 	 * Returns a string from a property file.
@@ -36,22 +30,13 @@ public class WebappResources {
 	 * @param request HttpServletRequest or null; default locale will be used if null passed
 	 */
 	public static String getString(String name, Locale locale) {
-		if (locale == null)
-			locale = getDefaultLocale();
 
-		// check cache
-		ResourceBundle bundle =
-			(ResourceBundle) resourceBundleTable.get(locale);
-
-		// load bundle
+		// get bundle
+		ResourceBundle bundle = getBundle(locale);
 		if (bundle == null) {
-			bundle = ResourceBundle.getBundle("webapp", locale);
-			if (bundle != null) {
-				resourceBundleTable.put(locale, bundle);
-			} else {
-				return name;
-			}
+			return name;
 		}
+
 		// get value
 		try {
 			return bundle.getString(name);
@@ -63,23 +48,17 @@ public class WebappResources {
 	/**
 	 * Returns a string from a property file
 	 */
-	public static String getString(String name, Locale locale, String replace0) {
-		if (locale == null)
-			locale = getDefaultLocale();
+	public static String getString(
+		String name,
+		Locale locale,
+		String replace0) {
 
-		// check cache
-		ResourceBundle bundle =
-			(ResourceBundle) resourceBundleTable.get(locale);
-
-		// load bundle
+		// get bundle
+		ResourceBundle bundle = getBundle(locale);
 		if (bundle == null) {
-			bundle = ResourceBundle.getBundle("webapp", locale);
-			if (bundle != null) {
-				resourceBundleTable.put(locale, bundle);
-			} else {
-				return name;
-			}
+			return name;
 		}
+
 		// get value
 		try {
 			String stringFromPropertiesFile = bundle.getString(name);
@@ -93,6 +72,32 @@ public class WebappResources {
 		}
 
 	}
+	/**
+	 * Obtains resource bundle for specified locale.
+	 * Loads bundle if necessary
+	 * @param locale Locale or null to use default locale
+	 * @return ResourceBundle or null if not found
+	 */
+	private static ResourceBundle getBundle(Locale locale) {
+		if (locale == null)
+			locale = getDefaultLocale();
+
+		// check cache
+		ResourceBundle bundle =
+			(ResourceBundle) resourceBundleTable.get(locale);
+
+		// load bundle
+		if (bundle == null) {
+			bundle =
+				ResourceBundle.getBundle(
+					WebappResources.class.getName(),
+					locale);
+			if (bundle != null) {
+				resourceBundleTable.put(locale, bundle);
+			}
+		}
+		return bundle;
+	}
 	private static Locale getDefaultLocale() {
 		String nl = BootLoader.getNL();
 		// sanity test
diff --git a/org.eclipse.help.webapp/src/webapp.properties b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
index 71a86af86..189378d92 100644
--- a/org.eclipse.help.webapp/src/webapp.properties
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
@@ -56,6 +56,7 @@ search=Search Results
 toc=Contents
 links=Links
 bookmarks=Bookmarks
+searchTooComplex=Search request too complex.
 
 Views=Navigation Views
 noLiveHelpInInfocenter=You must run help locally to perform "active help" actions.
@@ -82,4 +83,3 @@ TabsFrame=Selection of Navigation Views
 aView={0} View
 aViewToolbar={0} View Toolbar
 topic=Topic
-searchTooComplex=Search request too complex.
\ No newline at end of file
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/BookmarksData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/BookmarksData.java
index b0964e1fa..b073e75f7 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/BookmarksData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/BookmarksData.java
@@ -16,8 +16,8 @@ import javax.servlet.*;
 import javax.servlet.http.*;
 
 import org.eclipse.core.runtime.*;
-import org.eclipse.help.internal.*;
-import org.eclipse.help.internal.util.*;
+import org.eclipse.help.internal.base.*;
+import org.eclipse.help.internal.base.util.*;
 
 /**
  * This class manages bookmarks.
@@ -55,8 +55,8 @@ public class BookmarksData extends RequestData {
 			if(title==null){
 				return;
 			}
-			Preferences prefs = HelpPlugin.getDefault().getPluginPreferences();
-			String bookmarks = prefs.getString(HelpSystem.BOOKMARKS);
+			Preferences prefs = HelpBasePlugin.getDefault().getPluginPreferences();
+			String bookmarks = prefs.getString(BaseHelpSystem.BOOKMARKS);
 
 			// separate the url and title by vertical bar
 
@@ -65,8 +65,8 @@ public class BookmarksData extends RequestData {
 				return;
 			bookmarks =
 				bookmarks + "," + encode(bookmarkURL) + "|" + encode(title);
-			prefs.setValue(HelpSystem.BOOKMARKS, bookmarks);
-			HelpPlugin.getDefault().savePluginPreferences();
+			prefs.setValue(BaseHelpSystem.BOOKMARKS, bookmarks);
+			HelpBasePlugin.getDefault().savePluginPreferences();
 		}
 	}
 
@@ -79,8 +79,8 @@ public class BookmarksData extends RequestData {
 			if(title==null){
 				return;
 			}
-			Preferences prefs = HelpPlugin.getDefault().getPluginPreferences();
-			String bookmarks = prefs.getString(HelpSystem.BOOKMARKS);
+			Preferences prefs = HelpBasePlugin.getDefault().getPluginPreferences();
+			String bookmarks = prefs.getString(BaseHelpSystem.BOOKMARKS);
 			String removeString =
 				"," + encode(bookmarkURL) + "|" + encode(title);
 			int i = bookmarks.indexOf(removeString);
@@ -89,23 +89,23 @@ public class BookmarksData extends RequestData {
 			bookmarks =
 				bookmarks.substring(0, i)
 					+ bookmarks.substring(i + removeString.length());
-			prefs.setValue(HelpSystem.BOOKMARKS, bookmarks);
-			HelpPlugin.getDefault().savePluginPreferences();
+			prefs.setValue(BaseHelpSystem.BOOKMARKS, bookmarks);
+			HelpBasePlugin.getDefault().savePluginPreferences();
 		}
 	}
 	
 	public void removeAllBookmarks() {
-		Preferences prefs = HelpPlugin.getDefault().getPluginPreferences();
-		prefs.setValue(HelpSystem.BOOKMARKS, "");
-		HelpPlugin.getDefault().savePluginPreferences();
+		Preferences prefs = HelpBasePlugin.getDefault().getPluginPreferences();
+		prefs.setValue(BaseHelpSystem.BOOKMARKS, "");
+		HelpBasePlugin.getDefault().savePluginPreferences();
 	}
 
 	public Topic[] getBookmarks() {
 		// sanity test for infocenter, but this could not work anyway...
-		if (HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER) {
+		if (BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER) {
 			// this is workbench
-			Preferences prefs = HelpPlugin.getDefault().getPluginPreferences();
-			String bookmarks = prefs.getString(HelpSystem.BOOKMARKS);
+			Preferences prefs = HelpBasePlugin.getDefault().getPluginPreferences();
+			String bookmarks = prefs.getString(BaseHelpSystem.BOOKMARKS);
 			StringTokenizer tokenizer = new StringTokenizer(bookmarks, ",");
 			Topic[] topics = new Topic[tokenizer.countTokens()];
 			for (int i = 0; tokenizer.hasMoreTokens(); i++) {
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java
index 9af68b91d..7ea49119a 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java
@@ -13,7 +13,7 @@ package org.eclipse.help.internal.webapp.data;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 
 public class LayoutData extends RequestData {
 
@@ -135,10 +135,10 @@ public class LayoutData extends RequestData {
 		if (preferences.isWindowTitlePrefix()) {
 			return ServletResources.getString(
 				"browserTitle",
-				HelpSystem.getProductName(),
+				BaseHelpSystem.getProductName(),
 				request);
 		} else {
-			return HelpSystem.getProductName();
+			return BaseHelpSystem.getProductName();
 		}
 	}
 }
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LinksData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LinksData.java
index 89104cae4..1354f9b81 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LinksData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LinksData.java
@@ -83,7 +83,7 @@ public class LinksData extends RequestData {
 	 * or within a scope if specified
 	 */
 	private IToc findTocForTopic(String href) {
-		IToc[] tocs = HelpSystem.getTocManager().getTocs(getLocale());
+		IToc[] tocs = HelpPlugin.getTocManager().getTocs(getLocale());
 		for (int i = 0; i < tocs.length; i++) {
 			ITopic topic = tocs[i].getTopic(href);
 			if (topic != null)
@@ -95,7 +95,7 @@ public class LinksData extends RequestData {
 	private void loadLinks() {
 
 		String contextId = request.getParameter("contextId");
-		IContext context = HelpSystem.getContextManager().getContext(contextId);
+		IContext context = HelpSystem.getContext(contextId);
 		if (context == null) {
 			links = new IHelpResource[0];
 			return;
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java
index 3f0ba732b..5e2647d52 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java
@@ -13,15 +13,15 @@ package org.eclipse.help.internal.webapp.data;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 
 /**
  * Helper class for contents.jsp initialization
  */
 public class RequestData {
-	public final static int MODE_WORKBENCH = HelpSystem.MODE_WORKBENCH;
-	public final static int MODE_INFOCENTER = HelpSystem.MODE_INFOCENTER;
-	public final static int MODE_STANDALONE = HelpSystem.MODE_STANDALONE;
+	public final static int MODE_WORKBENCH = BaseHelpSystem.MODE_WORKBENCH;
+	public final static int MODE_INFOCENTER = BaseHelpSystem.MODE_INFOCENTER;
+	public final static int MODE_STANDALONE = BaseHelpSystem.MODE_STANDALONE;
 
 	protected ServletContext context;
 	protected HttpServletRequest request;
@@ -82,7 +82,7 @@ public class RequestData {
 	}
 
 	public int getMode() {
-		return HelpSystem.getMode();
+		return BaseHelpSystem.getMode();
 	}
 
 }
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java
index 0c9ce9f9e..b6a62a3b2 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java
@@ -16,8 +16,8 @@ import javax.servlet.*;
 import javax.servlet.http.*;
 
 import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 import org.eclipse.help.internal.search.*;
-import org.eclipse.help.internal.util.*;
 import org.eclipse.help.internal.webapp.*;
 import org.eclipse.help.internal.webapp.servlet.*;
 import org.eclipse.help.internal.workingset.*;
@@ -245,14 +245,14 @@ public class SearchData extends RequestData {
 			if (pm.isDone()) {
 				this.indexCompletion = 100;
 				SearchResults results = createHitCollector();
-				HelpSystem.getSearchManager().search(
+				BaseHelpSystem.getSearchManager().search(
 					createSearchQuery(),
 					results,
 					pm);
 				hits = results.getSearchHits();
 				if (hits == null) {
 					HelpWebappPlugin.logError(
-						Resources.getString("index_is_busy"),
+						HelpBaseResources.getString("index_is_busy"),
 						null);
 				}
 				return;
@@ -340,7 +340,7 @@ public class SearchData extends RequestData {
 			return new WorkingSet[0];
 		}
 		if (scopes.length
-			== HelpSystem.getTocManager().getTocs(getLocale()).length) {
+			== HelpPlugin.getTocManager().getTocs(getLocale()).length) {
 			// do not filter if all books are selected
 			return null;
 		}
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java
index 87ffec211..7defebdbd 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java
@@ -107,7 +107,6 @@ public class TocData extends RequestData {
 	//       and allow help classes in JSP's.
 
 	public int getTocCount() {
-		// get filtered tocs
 		return tocs.length;
 	}
 
@@ -171,11 +170,11 @@ public class TocData extends RequestData {
 	 * @return true if TOC should be visible
 	 */
 	public boolean isInRole(int toc) {
-		return HelpSystem.getTocManager().isTocInRole(toc, getLocale());
+		return HelpPlugin.getTocManager().isTocInRole(toc, getLocale());
 	}
 
 	private void loadTocs() {
-		tocs = HelpSystem.getTocManager().getTocs(getLocale());
+		tocs = HelpPlugin.getTocManager().getTocs(getLocale());
 		// Find the requested TOC
 		selectedToc = -1;
 		if (tocHref != null && tocHref.length() > 0) {
@@ -203,7 +202,7 @@ public class TocData extends RequestData {
 	 * Finds a TOC that contains specified topic
 	 * 
 	 * @param topic
-	 *           the topic href
+	 *            the topic href
 	 */
 	private int findTocContainingTopic(String topic) {
 		if (topic == null || topic.equals(""))
@@ -311,10 +310,10 @@ public class TocData extends RequestData {
 	 * @param topic
 	 * @param out
 	 * @param maxLevels
-	 *           relative number of topic levels to generate (pass
-	 *           <0 for inifinite), 1 generates this topic as last level topic
+	 *            relative number of topic levels to generate (pass
+	 *            <0 for inifinite), 1 generates this topic as last level topic
 	 * @param currentLevel
-	 *           current level of topic, 0 is first Level under TOC
+	 *            current level of topic, 0 is first Level under TOC
 	 * @throws IOException
 	 */
 	private void generateTopic(
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
index 38c49d104..66e436cc2 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
@@ -16,8 +16,8 @@ import java.util.*;
 import javax.servlet.http.*;
 
 import org.eclipse.core.boot.*;
-import org.eclipse.help.internal.*;
-import org.eclipse.help.internal.util.*;
+import org.eclipse.help.internal.base.*;
+import org.eclipse.help.internal.base.util.*;
 
 public class UrlUtil {
 	// XML escaped characters mapping
@@ -208,7 +208,7 @@ public class UrlUtil {
 		if (defaultLocale == null) {
 			initializeLocales();
 		}
-		if ((HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER)
+		if ((BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER)
 			|| request == null) {
 			return defaultLocale;
 		}
@@ -317,7 +317,7 @@ public class UrlUtil {
 		if (defaultLocale == null) {
 			defaultLocale = Locale.getDefault().toString();
 		}
-		if (HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER) {
+		if (BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER) {
 			return;
 		}
 
@@ -344,7 +344,7 @@ public class UrlUtil {
 		if (infocenterLocales == null) {
 			StringTokenizer tokenizer =
 				new StringTokenizer(
-					HelpPlugin.getDefault().getPluginPreferences().getString(
+					HelpBasePlugin.getDefault().getPluginPreferences().getString(
 						"locales"),
 					" ,\t");
 			while (tokenizer.hasMoreTokens()) {
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WebappPreferences.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WebappPreferences.java
index ec5ab3883..8d0369f4e 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WebappPreferences.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WebappPreferences.java
@@ -11,7 +11,7 @@
 package org.eclipse.help.internal.webapp.data;
 
 import org.eclipse.core.runtime.*;
-import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 
 /**
  * Preferences for availiable to webapp
@@ -22,7 +22,7 @@ public class WebappPreferences {
 	 * Constructor.
 	 */
 	public WebappPreferences() {
-		prefs = HelpPlugin.getDefault().getPluginPreferences();
+		prefs = HelpBasePlugin.getDefault().getPluginPreferences();
 	}
 	/**
 	 * @return String - URL of banner page or null
@@ -40,12 +40,12 @@ public class WebappPreferences {
 	}
 
 	public boolean isBookmarksView() {
-		return HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER
+		return BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER
 			&& "true".equals(prefs.getString("bookmarksView"));
 	}
 
 	public boolean isLinksView() {
-		return HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER
+		return BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER
 			&& "true".equals(prefs.getString("linksView"));
 	}
 
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContextServlet.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContextServlet.java
index e9d5d790d..f9bd60ad5 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContextServlet.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContextServlet.java
@@ -12,11 +12,11 @@ package org.eclipse.help.internal.webapp.servlet;
 
 import java.io.*;
 
-import javax.servlet.ServletException;
+import javax.servlet.*;
 import javax.servlet.http.*;
 
 import org.eclipse.help.*;
-import org.eclipse.help.internal.HelpSystem;
+import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.webapp.data.*;
 
 /**
@@ -43,7 +43,7 @@ public class ContextServlet extends HttpServlet {
 		if (contextId == null || contextId.length() < 2)
 			throw new ServletException();
 		contextId = contextId.substring(1);
-		IContext context = HelpSystem.getContextManager().getContext(contextId);
+		IContext context = HelpSystem.getContext(contextId);
 		if (context == null)
 			throw new ServletException();
 		
@@ -122,7 +122,7 @@ public class ContextServlet extends HttpServlet {
 		 * or within a scope if specified
 		 */
 		IToc findTocForTopic(String href) {
-			IToc[] tocs = HelpSystem.getTocManager().getTocs(locale);
+			IToc[] tocs = HelpPlugin.getTocManager().getTocs(locale);
 			for (int i = 0; i < tocs.length; i++) {
 				ITopic topic = tocs[i].getTopic(href);
 				if (topic != null)
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ControlServlet.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ControlServlet.java
index f065ff33a..b08529154 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ControlServlet.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ControlServlet.java
@@ -10,13 +10,12 @@
  *******************************************************************************/
 package org.eclipse.help.internal.webapp.servlet;
 
-import java.io.IOException;
+import java.io.*;
 
-import javax.servlet.ServletException;
+import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.eclipse.help.IHelp;
-import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 import org.eclipse.help.internal.webapp.data.*;
 /**
  * Servlet to control Eclipse helpApplication from standalone application.
@@ -26,7 +25,7 @@ import org.eclipse.help.internal.webapp.data.*;
  */
 public class ControlServlet extends HttpServlet {
 
-	private IHelp helpSupport = null;
+	private HelpDisplay helpDisplay = null;
 	private boolean shuttingDown = false;
 
 	/**
@@ -35,8 +34,8 @@ public class ControlServlet extends HttpServlet {
 	 */
 	public void init() throws ServletException {
 		super.init();
-		if (HelpSystem.getMode() == HelpSystem.MODE_STANDALONE) {
-			helpSupport = HelpSystem.getHelpSupport();
+		if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_STANDALONE) {
+			helpDisplay = BaseHelpSystem.getHelpDisplay();
 		}
 	}
 
@@ -92,7 +91,7 @@ public class ControlServlet extends HttpServlet {
 		if ("shutdown".equalsIgnoreCase(command)) {
 			shutdown();
 		} else if ("displayHelp".equalsIgnoreCase(command)) {
-			if (HelpSystem.getMode() == HelpSystem.MODE_STANDALONE) {
+			if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_STANDALONE) {
 				displayHelp(req);
 			}
 		} else {
@@ -115,9 +114,9 @@ public class ControlServlet extends HttpServlet {
 	private void displayHelp(HttpServletRequest req) {
 		String href = req.getParameter("href");
 		if (href != null) {
-			helpSupport.displayHelpResource(href);
+			helpDisplay.displayHelpResource(href);
 		} else {
-			helpSupport.displayHelp();
+			helpDisplay.displayHelp();
 		}
 	}
 }
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
index 15fb6bab7..21767fd90 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
@@ -18,6 +18,7 @@ import javax.servlet.*;
 import javax.servlet.http.*;
 
 import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 import org.eclipse.help.internal.webapp.data.*;
 
 /**
@@ -56,16 +57,16 @@ public class EclipseConnector {
 				if (i != -1)
 					url = url.substring(0, i);
 				// ensure the file is only accessed from a local installation
-				if (HelpSystem.getMode() == HelpSystem.MODE_INFOCENTER
+				if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER
 					|| !UrlUtil.isLocalRequest(req)) {
 					return;
 				}
 			} else {
 				// enable the role
-				IHelpRoleManager roleManager = HelpSystem.getRoleManager();
+				IHelpRoleManager roleManager = HelpPlugin.getRoleManager();
 				if (roleManager != null)
 					roleManager.enabledActivities(url);
-				
+
 				url = "help:" + url;
 			}
 
@@ -74,10 +75,11 @@ public class EclipseConnector {
 
 			long maxAge = 0;
 			try {
-				// getExpiration() throws NullPointerException when URL is jar:file:...
+				// getExpiration() throws NullPointerException when URL is
+				// jar:file:...
 				long expiration = con.getExpiration();
 				maxAge = (expiration - System.currentTimeMillis()) / 1000;
-				if (maxAge < 0 )
+				if (maxAge < 0)
 					maxAge = 0;
 			} catch (Exception e) {
 			}
@@ -149,7 +151,7 @@ public class EclipseConnector {
 		//System.out.println("help content for: " + url);
 
 		URLConnection con = null;
-		if (HelpSystem.getMode() == HelpSystem.MODE_INFOCENTER) {
+		if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER) {
 			// it is an infocentre, add client locale to url
 			String locale = UrlUtil.getLocale(request, response);
 			if (url.indexOf('?') >= 0) {
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
index 91f1b32bf..5d9541511 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
@@ -33,6 +33,10 @@ public class FramesetFilter implements IFilter {
 			return out;
 		}
 		
+		if("/nftopic".equals(req.getServletPath())){
+			return out;
+		}
+
 		String noframes = req.getParameter("noframes");
 		if ("true".equals(noframes)){
 			return out;
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
index e5d408c4e..ad7f588f6 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
@@ -56,7 +56,7 @@ public class InfocenterWorkingSetManager implements IHelpWorkingSetManager {
 		if (root == null)
 			root =
 				new AdaptableTocsArray(
-					HelpSystem.getTocManager().getTocs(locale));
+					HelpPlugin.getTocManager().getTocs(locale));
 		return root;
 	}
 
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
index ae69df7eb..4dd581e7b 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
@@ -17,7 +17,7 @@ import javax.servlet.http.*;
 
 import org.eclipse.core.runtime.*;
 import org.eclipse.help.ILiveHelpAction;
-import org.eclipse.help.internal.HelpSystem;
+import org.eclipse.help.internal.base.BaseHelpSystem;
 
 /**
  * Servlet to handle live help action requests
@@ -26,7 +26,7 @@ public class LiveHelpServlet extends HttpServlet {
 	/**
 	 */
 	public void init() throws ServletException {
-		if (HelpSystem.getMode() == HelpSystem.MODE_INFOCENTER) {
+		if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER) {
 			throw new ServletException();
 		}
 	}
@@ -37,7 +37,7 @@ public class LiveHelpServlet extends HttpServlet {
 	 */
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 		throws ServletException, IOException {
-		if (HelpSystem.getMode() == HelpSystem.MODE_INFOCENTER) {
+		if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER) {
 			return;
 		}
 		req.setCharacterEncoding("UTF-8");
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java
index ea00d780f..d83cdb244 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java
@@ -18,6 +18,7 @@ import javax.servlet.http.*;
 
 import org.eclipse.core.runtime.*;
 import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 import org.eclipse.help.internal.search.*;
 import org.eclipse.help.internal.webapp.*;
 import org.eclipse.help.internal.webapp.data.*;
@@ -75,7 +76,7 @@ public class SearchServlet extends HttpServlet {
 			NullProgressMonitor pm = new NullProgressMonitor();
 
 			SearchResults results = createHitCollector(request, response);
-			HelpSystem.getSearchManager().search(
+			BaseHelpSystem.getSearchManager().search(
 				createSearchQuery(request),
 				results,
 				pm);
@@ -170,7 +171,7 @@ public class SearchServlet extends HttpServlet {
 			return new WorkingSet[0];
 		}
 		if (scopes.length
-			== HelpSystem.getTocManager().getTocs(locale).length) {
+			== HelpPlugin.getTocManager().getTocs(locale).length) {
 			// do not filter if all books are selected
 			return null;
 		}
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocServlet.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocServlet.java
index d978b94ff..9aa7000eb 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocServlet.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocServlet.java
@@ -12,11 +12,11 @@ package org.eclipse.help.internal.webapp.servlet;
 
 import java.io.*;
 
-import javax.servlet.ServletException;
+import javax.servlet.*;
 import javax.servlet.http.*;
 
 import org.eclipse.help.*;
-import org.eclipse.help.internal.HelpSystem;
+import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.toc.*;
 import org.eclipse.help.internal.webapp.data.*;
 /**
@@ -72,7 +72,7 @@ public class TocServlet extends HttpServlet {
 	 */
 	private void serializeToc(String tocID, HttpServletResponse resp)
 		throws ServletException, IOException {
-		IToc toc = (IToc) HelpSystem.getTocManager().getToc(tocID, locale);
+		IToc toc = (IToc) HelpPlugin.getTocManager().getToc(tocID, locale);
 		serializeToc(toc, resp);
 	}
 	/**
@@ -93,7 +93,7 @@ public class TocServlet extends HttpServlet {
 	 */
 	private void serializeTocs(HttpServletResponse resp)
 		throws ServletException, IOException {
-		TocManager tocManager = HelpSystem.getTocManager();
+		TocManager tocManager = HelpPlugin.getTocManager();
 		IToc[] tocs = tocManager.getTocs(locale);
 
 		TocWriter gen = new TocWriter(resp.getWriter());
@@ -144,7 +144,7 @@ public class TocServlet extends HttpServlet {
 		if (topic == null || topic.equals(""))
 			return null;
 
-		IToc[] tocs = HelpSystem.getTocManager().getTocs(locale);
+		IToc[] tocs = HelpPlugin.getTocManager().getTocs(locale);
 		for (int i = 0; i < tocs.length; i++)
 			if (tocs[i].getTopic(topic) != null)
 				return tocs[i];
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java
index 47c952f9b..cfa0113a7 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java
@@ -14,7 +14,7 @@ import java.io.*;
 
 import javax.servlet.http.*;
 
-import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.base.*;
 import org.eclipse.help.internal.workingset.*;
 
 /**
@@ -34,13 +34,13 @@ public class WebappWorkingSetManager implements IHelpWorkingSetManager {
 		HttpServletRequest request,
 		HttpServletResponse response,
 		String locale) {
-		if (HelpSystem.getMode() == HelpSystem.MODE_INFOCENTER) {
+		if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER) {
 			wSetManager =
 				new InfocenterWorkingSetManager(request, response, locale);
 		} else {
-			wSetManager = HelpSystem.getWorkingSetManager(locale);
+			wSetManager = BaseHelpSystem.getWorkingSetManager(locale);
 			if (!workingSetsSynchronized
-				&& HelpSystem.getMode() == HelpSystem.MODE_WORKBENCH) {
+				&& BaseHelpSystem.getMode() == BaseHelpSystem.MODE_WORKBENCH) {
 				// upon startup in workbench mode, make sure working sets are in synch with those from UI
 				workingSetsSynchronized = true;
 				((WorkingSetManager)wSetManager).synchronizeWorkingSets();
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
index 6d11f3c44..e3134908b 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
@@ -11,7 +11,8 @@
 package org.eclipse.help.internal.webapp.servlet;
 import java.io.*;
 
-import org.eclipse.help.internal.util.*;
+import org.eclipse.help.internal.base.*;
+import org.eclipse.help.internal.base.util.*;
 import org.eclipse.help.internal.webapp.*;
 /**
  * Helper class to generate xml files.
@@ -51,7 +52,7 @@ public class XMLGenerator {
 			println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 		} catch (IOException ioe) {
 			HelpWebappPlugin.logError(
-				Resources.getString("E014", outFile.getAbsolutePath()),
+				HelpBaseResources.getString("E014", outFile.getAbsolutePath()),
 				ioe);
 		}
 	}
@@ -69,7 +70,7 @@ public class XMLGenerator {
 		if (out.checkError())
 			if (outFile != null)
 				HelpWebappPlugin.logError(
-					Resources.getString("E015", outFile.getAbsolutePath()),
+					HelpBaseResources.getString("E015", outFile.getAbsolutePath()),
 					null);
 		out = null;
 	}