Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis D'Entremont2007-03-15 11:36:58 -0400
committerCurtis D'Entremont2007-03-15 11:36:58 -0400
commit25f602778deee94ef9cc138cce359b471b15bdee (patch)
tree16bf72c460786f8a5d40b11953d48c1f5e6121ee /org.eclipse.help.webapp
parent12c957f4685b1385aa0781de97baee6e36853aa6 (diff)
downloadeclipse.platform.ua-25f602778deee94ef9cc138cce359b471b15bdee.tar.gz
eclipse.platform.ua-25f602778deee94ef9cc138cce359b471b15bdee.tar.xz
eclipse.platform.ua-25f602778deee94ef9cc138cce359b471b15bdee.zip
138390 [Help] reconsider Tomcat
Diffstat (limited to 'org.eclipse.help.webapp')
-rw-r--r--org.eclipse.help.webapp/.classpath1
-rw-r--r--org.eclipse.help.webapp/.externalToolBuilders/JSP Builder.launch39
-rw-r--r--org.eclipse.help.webapp/.project10
-rw-r--r--org.eclipse.help.webapp/META-INF/MANIFEST.MF12
-rw-r--r--org.eclipse.help.webapp/WEB-INF/.cvsignore1
-rw-r--r--org.eclipse.help.webapp/WEB-INF/lib/.cvsignore3
-rw-r--r--org.eclipse.help.webapp/WEB-INF/web.xml176
-rw-r--r--org.eclipse.help.webapp/build.properties38
-rw-r--r--org.eclipse.help.webapp/build.xml360
-rw-r--r--org.eclipse.help.webapp/buildJSPs.xml212
-rw-r--r--org.eclipse.help.webapp/plugin.xml143
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ActivitiesData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ActivitiesData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/BookmarksData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/BookmarksData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/EnabledTopicUtils.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/EnabledTopicUtils.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/IndexData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/IndexData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LinksData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LinksData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/PrintData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ServletResources.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/TocData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ToolbarButton.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarButton.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ToolbarData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/Topic.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/Topic.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/View.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/View.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WebappPreferences.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WebappPreferences.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/BreadcrumbsFilter.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/BreadcrumbsFilter.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ContentServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContentServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ContextServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContextServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ControlServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ControlServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/CookieUtil.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/CookieUtil.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/DynamicXHTMLFilter.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/DynamicXHTMLFilter.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ExtensionServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ExtensionServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadAndBodyOutputStream.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadAndBodyOutputStream.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadOutputStream.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadOutputStream.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IFilter.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IFilter.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IndexFragmentServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IndexFragmentServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IndexServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IndexServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/NavServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/NavServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/SearchServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/TocFragmentServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocFragmentServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/TocServlet.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocServlet.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java)0
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java (renamed from org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java)0
54 files changed, 417 insertions, 578 deletions
diff --git a/org.eclipse.help.webapp/.classpath b/org.eclipse.help.webapp/.classpath
index 923835d54..ce7393340 100644
--- a/org.eclipse.help.webapp/.classpath
+++ b/org.eclipse.help.webapp/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry output="WEB-INF/classes" kind="src" path="src_servlets"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.help.webapp/.externalToolBuilders/JSP Builder.launch b/org.eclipse.help.webapp/.externalToolBuilders/JSP Builder.launch
new file mode 100644
index 000000000..99fd7a284
--- /dev/null
+++ b/org.eclipse.help.webapp/.externalToolBuilders/JSP Builder.launch
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="build,"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;workingSet&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.help.webapp/index.jsp&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.help.webapp/basic&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.help.webapp/advanced&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.help.webapp/buildJSPs.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.help.webapp/META-INF&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.help.webapp/src&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.help.webapp/plugin.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="build,"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
+<mapEntry key="eclipse.running" value="true"/>
+<mapEntry key="eclipse.pdebuild.scripts" value="/C:/Users/eclipse/Desktop/curtis/eclipse/plugins/org.eclipse.pde.build_3.2.100.v20070206/scripts/"/>
+<mapEntry key="workspace_loc" value="${workspace_loc}"/>
+<mapEntry key="eclipse.home" value="C:\Users\eclipse\Desktop\curtis\eclipse"/>
+<mapEntry key="eclipse.pdebuild.templates" value="/C:/Users/eclipse/Desktop/curtis/eclipse/plugins/org.eclipse.pde.build_3.2.100.v20070206/templates/"/>
+<mapEntry key="target.folder" value="${build_project}/bin"/>
+<mapEntry key="eclipse.pdebuild.home" value="/C:/Users/eclipse/Desktop/curtis/eclipse/plugins/org.eclipse.pde.build_3.2.100.v20070206/./"/>
+<mapEntry key="target_home" value="${target_home}"/>
+</mapAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.antHome&quot;&gt;&#13;&#10;&lt;memento default=&quot;true&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.help.webapp"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.help.webapp/buildJSPs.xml"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.help.webapp/buildJSPs.xml}"/>
+</launchConfiguration>
diff --git a/org.eclipse.help.webapp/.project b/org.eclipse.help.webapp/.project
index e8e323a49..bf7471ad5 100644
--- a/org.eclipse.help.webapp/.project
+++ b/org.eclipse.help.webapp/.project
@@ -20,6 +20,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <triggers>auto,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value>&lt;project&gt;/.externalToolBuilders/JSP Builder.launch</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/org.eclipse.help.webapp/META-INF/MANIFEST.MF
index 2336248d4..c772b718b 100644
--- a/org.eclipse.help.webapp/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.webapp/META-INF/MANIFEST.MF
@@ -1,17 +1,21 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_webapp_plugin_name
-Bundle-SymbolicName: org.eclipse.help.webapp; singleton:=true
+Bundle-SymbolicName: org.eclipse.help.webapp;singleton:=true
Bundle-Version: 3.3.0.qualifier
-Bundle-ClassPath: webapp.jar,
- WEB-INF/lib/servlets.jar
Bundle-Activator: org.eclipse.help.internal.webapp.HelpWebappPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help.base;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
+ org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
+ org.apache.jasper
Eclipse-LazyStart: true
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.servlet;x-friends:="org.eclipse.ua.tests"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Import-Package: javax.servlet;version="2.4.0",
+ javax.servlet.http;version="2.4.0",
+ org.apache.jasper.servlet,
+ org.eclipse.equinox.jsp.jasper.registry,
+ org.osgi.service.http;version="1.2.0"
diff --git a/org.eclipse.help.webapp/WEB-INF/.cvsignore b/org.eclipse.help.webapp/WEB-INF/.cvsignore
deleted file mode 100644
index 90b07e9d4..000000000
--- a/org.eclipse.help.webapp/WEB-INF/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-classes
diff --git a/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore b/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
deleted file mode 100644
index 3adad4940..000000000
--- a/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 0045e8592..000000000
--- a/org.eclipse.help.webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-
-<!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>
-
- <servlet>
- <servlet-name>control</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.ControlServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>content</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.ContentServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>livehelp</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.LiveHelpServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>toc</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.TocServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>nav</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.NavServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>tocfragment</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.TocFragmentServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>indexfragment</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.IndexFragmentServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>index</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.IndexServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>search</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.SearchServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>context</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.ContextServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>extension</servlet-name>
- <servlet-class>org.eclipse.help.internal.webapp.servlet.ExtensionServlet</servlet-class>
- </servlet>
-
-<!-- placeholder for JSPs web.xml -->
-
- <servlet-mapping>
- <servlet-name>control</servlet-name>
- <url-pattern>/control.html</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>content</servlet-name>
- <url-pattern>/content/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>content</servlet-name>
- <url-pattern>/topic/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>nav</servlet-name>
- <url-pattern>/nav/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>content</servlet-name>
- <url-pattern>/nftopic/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>content</servlet-name>
- <url-pattern>/ntopic/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>content</servlet-name>
- <url-pattern>/rtopic/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>livehelp</servlet-name>
- <url-pattern>/livehelp/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>toc</servlet-name>
- <url-pattern>/toc/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>tocfragment</servlet-name>
- <url-pattern>/tocfragment/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>indexfragment</servlet-name>
- <url-pattern>/indexfragment/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>index</servlet-name>
- <url-pattern>/index/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>search</servlet-name>
- <url-pattern>/search/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>context</servlet-name>
- <url-pattern>/context/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>extension</servlet-name>
- <url-pattern>/extension/*</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-<!-- Uncomment to enable secure access to the InfoCenter. Update the role-name as appropriate.
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>helproot</web-resource-name>
- <description></description>
- <url-pattern>/*</url-pattern>
- <http-method>
- GET</http-method>
- <http-method>
- PUT</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description></description>
- <role-name>tomcat</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
- <security-role>
- <description></description>
- <role-name>tomcat</role-name>
- </security-role>
--->
-</web-app>
-
diff --git a/org.eclipse.help.webapp/build.properties b/org.eclipse.help.webapp/build.properties
index 57bb0bbbd..5c54b4e7a 100644
--- a/org.eclipse.help.webapp/build.properties
+++ b/org.eclipse.help.webapp/build.properties
@@ -8,30 +8,18 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-custom=true
-# properties for building a plugin; create project source folder - temp.folder/jsp.jar.src source before using pde to generate skeleton script
-source.webapp.jar=src/
-source.WEB-INF/lib/servlets.jar=src_servlets/
-source.WEB-INF/lib/jsp.jar=${temp.folder}/jsp.jar.src/
+source.. = src/
src.includes=about.html
-bin.includes=META-INF/,advanced/,basic/,WEB-INF/,*.html,*.jar,*.jsp,plugin.properties,plugin.xml,.options
-bin.excludes=WEB-INF/classes/
-jars.compile.order=webapp.jar,WEB-INF/lib/servlets.jar,WEB-INF/lib/jsp.jar
-jars.extra.classpath=../org.eclipse.osgi/bin,\
- ../org.eclipse.osgi,\
- ../org.eclipse.osgi/@dot,\
- ../org.eclipse.core.runtime/bin,\
- ../org.eclipse.core.runtime,\
- ../org.eclipse.core.runtime/@dot,\
- ../org.eclipse.help/bin,\
- ../org.eclipse.help,\
- ../org.eclipse.help/@dot,\
- ../org.eclipse.help.base/bin,\
- ../org.eclipse.help.base,\
- ../org.eclipse.help.base/@dot,\
- ../org.eclipse.help.appserver/bin,\
- ../org.eclipse.help.appserver,\
- ../org.eclipse.help.appserver/@dot,\
- ../org.eclipse.tomcat/servlet.jar,\
- ../org.eclipse.tomcat/jasper-runtime.jar
+customBuildCallbacks=buildJSPs.xml
+bin.includes = plugin.xml,\
+ .,\
+ plugin.properties,\
+ about.html,\
+ META-INF/,\
+ index.jsp,\
+ basic/,\
+ advanced/,\
+ .options
+output.. = bin/
+
diff --git a/org.eclipse.help.webapp/build.xml b/org.eclipse.help.webapp/build.xml
deleted file mode 100644
index 52612fc32..000000000
--- a/org.eclipse.help.webapp/build.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.help.webapp" default="build.jars" basedir=".">
-
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <!-- Compiler settings. -->
- <property name="javacFailOnError" value="false"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="false"/>
- <property name="javacSource" value="1.3"/>
- <property name="javacTarget" value="1.2"/>
- <property name="compilerArg" value=""/>
- <property name="logExtension" value=".log"/>
-
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
-
- <property name="fragment" value="org.eclipse.help.webapp"/>
- <property name="version.suffix" value="3.2.0"/>
- <property name="full.name" value="${fragment}_${version.suffix}"/>
-
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/org.eclipse.help.webapp">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
- </target>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
- </target>
-
- <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 destfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <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="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}" >
- <compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <classpath>
- <pathelement path="../org.eclipse.help.base/bin"/>
- <pathelement path="../org.eclipse.help.base/@dot"/>
- <pathelement path="../org.apache.lucene/bin"/>
- <pathelement path="../org.apache.lucene/lucene-1.4.3.jar"/>
- <pathelement path="../org.apache.lucene/parser.jar"/>
- <pathelement path="../org.eclipse.help/bin"/>
- <pathelement path="../org.eclipse.help/@dot"/>
- <pathelement path="../org.eclipse.core.runtime"/>
- <pathelement path="../org.eclipse.core.runtime/@dot"/>
- <pathelement path="../org.eclipse.core.expressions"/>
- <pathelement path="../org.eclipse.core.expressions/@dot"/>
- <pathelement path="../org.eclipse.equinox.common"/>
- <pathelement path="../org.eclipse.equinox.common/@dot"/>
- <pathelement path="../org.eclipse.equinox.common/bin"/>
- <pathelement path="../org.eclipse.equinox.preferences"/>
- <pathelement path="../org.eclipse.equinox.preferences/@dot"/>
- <pathelement path="../org.eclipse.osgi"/>
- <pathelement path="../org.eclipse.osgi/@dot"/>
- <pathelement path="../org.eclipse.help.appserver/bin"/>
- <pathelement path="../org.eclipse.help.appserver/@dot"/>
- <pathelement path="../org.eclipse.osgi/bin"/>
- <pathelement path="../org.eclipse.core.runtime/bin"/>
- <pathelement path="../org.eclipse.help"/>
- <pathelement path="../org.eclipse.help.base"/>
- <pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
- </classpath>
- <src path="src/" />
- <compilerarg line="-log ${temp.folder}/webapp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </javac>
- <!-- Copy necessary resources -->
- <copy todir="${temp.folder}/webapp.jar.bin" failonerror="true">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
- </copy>
-<!-- custom begin -->
- <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 destfile="${build.result.folder}/webapp.jar" basedir="${temp.folder}/webapp.jar.bin"/>
- <delete dir="${temp.folder}/webapp.jar.bin"/>
- </target>
-
- <target name="webappsrc.zip" depends="init" unless="webappsrc.zip">
- <mkdir dir="${build.result.folder}"/>
- <zip destfile="${build.result.folder}/webappsrc.zip" filesonly="false" whenempty="skip" update="false">
- <fileset dir="src/" includes="**/*.java" />
- </zip>
- </target>
-
- <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="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}" >
- <compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <classpath>
- <pathelement path="../org.eclipse.help.base/bin"/>
- <pathelement path="../org.eclipse.help.base/@dot"/>
- <pathelement path="../org.apache.lucene/bin"/>
- <pathelement path="../org.apache.lucene/lucene-1.4.3.jar"/>
- <pathelement path="../org.apache.lucene/parser.jar"/>
- <pathelement path="../org.eclipse.help/bin"/>
- <pathelement path="../org.eclipse.help/@dot"/>
- <pathelement path="../org.eclipse.core.runtime"/>
- <pathelement path="../org.eclipse.core.runtime/@dot"/>
- <pathelement path="../org.eclipse.core.expressions"/>
- <pathelement path="../org.eclipse.core.expressions/@dot"/>
- <pathelement path="../org.eclipse.core.expressions/bin"/>
- <pathelement path="../org.eclipse.equinox.common"/>
- <pathelement path="../org.eclipse.equinox.common/@dot"/>
- <pathelement path="../org.eclipse.equinox.common/bin"/>
- <pathelement path="../org.eclipse.equinox.preferences"/>
- <pathelement path="../org.eclipse.equinox.preferences/@dot"/>
- <pathelement path="../org.eclipse.osgi"/>
- <pathelement path="../org.eclipse.osgi/@dot"/>
- <pathelement path="../org.eclipse.help.appserver/bin"/>
- <pathelement path="../org.eclipse.help.appserver/@dot"/>
- <pathelement path="${build.result.folder}/bin"/>
- <pathelement path="${build.result.folder}/WEB-INF/classes"/>
- <pathelement path="${build.result.folder}/webapp.jar"/>
- <pathelement path="../org.eclipse.osgi/bin"/>
- <pathelement path="../org.eclipse.core.runtime/bin"/>
- <pathelement path="../org.eclipse.help"/>
- <pathelement path="../org.eclipse.help.base"/>
- <pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
- </classpath>
- <src path="src_servlets/" />
- <compilerarg line="-log ${temp.folder}/WEB-INF/lib/servlets.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </javac>
- <!-- Copy necessary resources -->
- <copy todir="${temp.folder}/WEB-INF/lib/servlets.jar.bin" failonerror="true">
- <fileset dir="src_servlets/" excludes="**/*.java, **/package.htm*" />
- </copy>
- <mkdir dir="${build.result.folder}/WEB-INF/lib"/>
- <jar destfile="${build.result.folder}/WEB-INF/lib/servlets.jar" basedir="${temp.folder}/WEB-INF/lib/servlets.jar.bin"/>
- <delete dir="${temp.folder}/WEB-INF/lib/servlets.jar.bin"/>
- </target>
-
- <target name="WEB-INF/lib/servletssrc.zip" depends="init" unless="WEB-INF/lib/servletssrc.zip">
- <mkdir dir="${build.result.folder}/WEB-INF/lib"/>
- <zip destfile="${build.result.folder}/WEB-INF/lib/servletssrc.zip" filesonly="false" whenempty="skip" update="false">
- <fileset dir="src_servlets/" includes="**/*.java" />
- </zip>
- </target>
-
- <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 -->
- <!-- generate java code from JSPs -->
- <path id="jasper.classpath" >
- <pathelement location="../org.apache.ant/lib/ant.jar"/>
- <pathelement location="../org.apache.ant/lib/optional.jar"/>
- <pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
- <pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
- <pathelement location="../org.eclipse.tomcat/servlet.jar" />
- <pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />
- </path>
- <delete dir="${temp.folder}/jsp.jar.src"/>
- <mkdir dir="${temp.folder}/jsp.jar.src"/>
- <java
- classname="org.apache.jasper.JspC"
- fork="true"
- failonerror="false"
- classpathref="jasper.classpath"
- output="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}">
- <arg value="-v3" />
- <arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
- <arg value="-die" />
- <arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
- <arg value="-webinc" /><arg value="${temp.folder}/jsp.jar.src/web.xml.fragment" />
- <arg value="-webapp" /><arg value="${basedir}" />
- </java>
-<!-- custom end -->
- <!-- compile the source code -->
- <javac destdir="${temp.folder}/WEB-INF/lib/jsp.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}" >
- <compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <classpath>
- <pathelement path="../org.eclipse.help.base/bin"/>
- <pathelement path="../org.eclipse.help.base/@dot"/>
- <pathelement path="../org.apache.lucene/bin"/>
- <pathelement path="../org.apache.lucene/lucene-1.4.3.jar"/>
- <pathelement path="../org.apache.lucene/parser.jar"/>
- <pathelement path="../org.eclipse.help/bin"/>
- <pathelement path="../org.eclipse.help/@dot"/>
- <pathelement path="../org.eclipse.core.runtime"/>
- <pathelement path="../org.eclipse.core.runtime/@dot"/>
- <pathelement path="../org.eclipse.core.expressions"/>
- <pathelement path="../org.eclipse.core.expressions/@dot"/>
- <pathelement path="../org.eclipse.equinox.common"/>
- <pathelement path="../org.eclipse.equinox.common/@dot"/>
- <pathelement path="../org.eclipse.equinox.preferences"/>
- <pathelement path="../org.eclipse.equinox.preferences/@dot"/>
- <pathelement path="../org.eclipse.osgi"/>
- <pathelement path="../org.eclipse.osgi/@dot"/>
- <pathelement path="../org.eclipse.help.appserver/bin"/>
- <pathelement path="../org.eclipse.help.appserver/@dot"/>
- <pathelement path="${build.result.folder}/bin"/>
- <pathelement path="${build.result.folder}/WEB-INF/classes"/>
- <pathelement path="${build.result.folder}/webapp.jar"/>
- <pathelement path="${build.result.folder}/WEB-INF/lib/servlets.jar"/>
- <pathelement path="../org.eclipse.osgi/bin"/>
- <pathelement path="../org.eclipse.core.runtime/bin"/>
- <pathelement path="../org.eclipse.help"/>
- <pathelement path="../org.eclipse.help.base"/>
- <pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
- </classpath>
- <src path="${temp.folder}/jsp.jar.src/" />
- <compilerarg line="-log ${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-<!-- custom begin -->
- <compilerarg value="-warn:-serial,unused" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-<!-- custom end -->
- </javac>
- <!-- Copy necessary resources -->
- <copy todir="${temp.folder}/WEB-INF/lib/jsp.jar.bin" failonerror="true">
- <fileset dir="${temp.folder}/jsp.jar.src/" excludes="**/*.java, **/package.htm*" />
- </copy>
- <mkdir dir="${build.result.folder}/WEB-INF/lib"/>
- <jar destfile="${build.result.folder}/WEB-INF/lib/jsp.jar" basedir="${temp.folder}/WEB-INF/lib/jsp.jar.bin"/>
- <delete dir="${temp.folder}/WEB-INF/lib/jsp.jar.bin"/>
- </target>
-
- <target name="WEB-INF/lib/jspsrc.zip" depends="init" unless="WEB-INF/lib/jspsrc.zip">
- <mkdir dir="${build.result.folder}/WEB-INF/lib"/>
- </target>
-
- <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"/>
- <antcall target="WEB-INF/lib/servlets.jar"/>
- <available property="WEB-INF/lib/jsp.jar" file="${build.result.folder}/WEB-INF/lib/jsp.jar"/>
- <antcall target="WEB-INF/lib/jsp.jar"/>
- </target>
-
- <target name="build.sources" depends="init">
- <available property="webappsrc.zip" file="${build.result.folder}/webappsrc.zip"/>
- <antcall target="webappsrc.zip"/>
- <available property="WEB-INF/lib/servletssrc.zip" file="${build.result.folder}/WEB-INF/lib/servletssrc.zip"/>
- <antcall target="WEB-INF/lib/servletssrc.zip"/>
-<!-- custom begin -->
-<!--
- <available property="WEB-INF/lib/jspsrc.zip" file="${build.result.folder}/WEB-INF/lib/jspsrc.zip"/>
- <antcall target="WEB-INF/lib/jspsrc.zip"/>
--->
-<!-- custom end -->
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${full.name}"/>
- <copy todir="${destination.temp.folder}/${full.name}" failonerror="true">
- <fileset dir="${build.result.folder}" includes="webapp.jar,WEB-INF/lib/servlets.jar,WEB-INF/lib/jsp.jar" excludes="WEB-INF/classes/" />
- </copy>
- <copy todir="${destination.temp.folder}/${full.name}" failonerror="true">
- <fileset dir="${basedir}" includes="META-INF/,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"
- token="&lt;!-- placeholder for JSPs web.xml --&gt;"
- value="${web.xml.fragment}"
- encoding="ISO-8859-1" />
- <eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}"/>
-<!-- custom end -->
- </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" failonerror="false"/>
-<!-- custom begin -->
-<!--
- <copy file="${build.result.folder}/WEB-INF/lib/jspsrc.zip" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib" failonerror="false"/>
--->
-<!-- custom end -->
- <mkdir dir="${destination.temp.folder}/${full.name}"/>
- <copy file="${build.result.folder}/webappsrc.zip" todir="${destination.temp.folder}/${full.name}" failonerror="false"/>
- <copy todir="${destination.temp.folder}/${full.name}" failonerror="false">
- <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${logExtension}" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib" failonerror="false"/>
- <copy file="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib" failonerror="false"/>
- <mkdir dir="${destination.temp.folder}/${full.name}"/>
- <copy file="${temp.folder}/webapp.jar.bin${logExtension}" todir="${destination.temp.folder}/${full.name}" failonerror="false"/>
- </target>
-
- <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 dir="${temp.folder}"/>
- </target>
-
- <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
- <eclipse.convertPath fileSystemPath="d:/runtime-workspacePDE/org.eclipse.help.webapp" property="resourcePath"/>
- <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
- </target>
-
- <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"/>
- <antcall target="build.sources"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <antcall target="gather.sources">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <delete>
- <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" />
- </delete>
- <zip destfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-</project>
diff --git a/org.eclipse.help.webapp/buildJSPs.xml b/org.eclipse.help.webapp/buildJSPs.xml
new file mode 100644
index 000000000..38f83e88f
--- /dev/null
+++ b/org.eclipse.help.webapp/buildJSPs.xml
@@ -0,0 +1,212 @@
+
+<!-- ===================================================================== -->
+<!-- Ant build script for JSPs -->
+<!-- ===================================================================== -->
+<project name="JSP Build">
+
+ <!-- ===================================================================== -->
+ <!-- Workspace (dev) build; called as an Ant builder -->
+ <!-- ===================================================================== -->
+ <target name="build">
+
+ <!-- Construct the full classpath -->
+ <path id="@dot.classpath" >
+ <pathelement path="${target.folder}"/>
+ <dirset dir="${workspace_loc}">
+ <patternset>
+ <include name="org.eclipse.help/bin"/>
+ <include name="org.eclipse.help.base/bin"/>
+ </patternset>
+ </dirset>
+ <fileset dir="${target_home}/plugins">
+ <patternset>
+ <include name="javax.servlet*.jar"/>
+ <include name="javax.servlet.jsp*.jar"/>
+ <include name="org.apache.ant*/lib/ant.jar"/>
+ <include name="org.apache.commons.el*.jar"/>
+ <include name="org.apache.commons.logging*.jar"/>
+ <include name="org.apache.jasper*.jar"/>
+ <include name="org.eclipse.help*.jar"/>
+ <include name="org.eclipse.help.base*.jar"/>
+ </patternset>
+ </fileset>
+ </path>
+
+ <!-- Compile the JSPs -->
+ <antcall target="compile">
+ <reference refid="@dot.classpath"/>
+ </antcall>
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Compile the JSPs -->
+ <!-- ===================================================================== -->
+ <target name="compile">
+
+ <!-- Invoke Jasper compiler -->
+ <java
+ classname="org.apache.jasper.JspC"
+ classpathref="@dot.classpath"
+ fork="true"
+ failonerror="true">
+ <arg value="-compile"/>
+ <arg value="-d"/>
+ <arg value="${target.folder}" />
+ <arg value="-p"/>
+ <arg value="org.eclipse.help.internal.webapp.jsp"/>
+ <arg value="-webapp"/>
+ <arg value="${basedir}"/>
+ <arg value="-die"/>
+ </java>
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target build.jars -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="pre.build.jars">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target build.jars -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="post.build.jars">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target build.sources -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="pre.build.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target build.sources -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="post.build.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the compilation target <name> -->
+ <!-- Substitute "name" with the name of the compilation target, eg @dot -->
+ <!-- Available parameters : -->
+ <!-- source.foldern : n = 1 ... N, the source folders -->
+ <!-- target.folder : where the results of the compilation go -->
+ <!-- <name>.classpath : name = name of the compilation target. A -->
+ <!-- reference to the classpath structure. -->
+ <!-- ===================================================================== -->
+ <target name="pre.@dot">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do during the compilation target <name>, after the compile -->
+ <!-- but before jaring. Substitute "name" with the name of the compilation-->
+ <!-- target, eg @dot -->
+ <!-- Available parameters : -->
+ <!-- source.foldern : n = 1 ... N, the source folders -->
+ <!-- target.folder : where the results of the compilation go -->
+ <!-- <name>.classpath : name = name of the compilation target. A -->
+ <!-- reference to the classpath structure. -->
+ <!-- ===================================================================== -->
+ <target name="post.compile.@dot">
+
+ <!-- Compile the JSPs -->
+ <antcall target="compile">
+ <reference refid="@dot.classpath"/>
+ </antcall>
+
+ <!-- JspC always generates .java files; delete them -->
+ <delete>
+ <fileset dir="${target.folder}" includes="**/*.java"/>
+ </delete>
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the compilation target <name> -->
+ <!-- Substitute "name" with the name of the compilation target, eg @dot -->
+ <!-- Available parameters : -->
+ <!-- jar.location - the location of the compilation results -->
+ <!-- <name>.classpath : name = name of the compilation target. A -->
+ <!-- reference to the classpath structure. -->
+ <!-- ===================================================================== -->
+ <target name="post.@dot">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.bin.parts -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder containing the build results -->
+ <!-- target.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.bin.parts">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target gather.bin.parts -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder containing the build results -->
+ <!-- target.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="post.gather.bin.parts">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.sources -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target gather.sources -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="post.gather.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.logs -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.logs">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target gather.logs -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="post.gather.logs">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target clean -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.clean">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target clean -->
+ <!-- Available parameters : -->
+ <!-- plugin.destination - final destination of the build -->
+ <!-- build.result.folder - results of the compilation -->
+ <!-- temp.folder - temporary folder -->
+ <!-- ===================================================================== -->
+ <target name="post.clean">
+ </target>
+
+</project>
diff --git a/org.eclipse.help.webapp/plugin.xml b/org.eclipse.help.webapp/plugin.xml
index 41fd612e8..07589d8a3 100644
--- a/org.eclipse.help.webapp/plugin.xml
+++ b/org.eclipse.help.webapp/plugin.xml
@@ -1,12 +1,139 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin>
-
- <extension
- point="org.eclipse.help.base.webapp">
- <webapp
- default="true">
- </webapp>
- </extension>
-
+ <extension
+ point="org.eclipse.equinox.http.registry.httpcontexts">
+ <httpcontext
+ name="help"
+ path="/">
+ </httpcontext>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.resources">
+ <resource
+ alias="/"
+ base-name="/"
+ httpcontext-name="help">
+ </resource>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/control.html"
+ class="org.eclipse.help.internal.webapp.servlet.ControlServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/content"
+ class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/topic"
+ class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/nftopic"
+ class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/ntopic"
+ class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/rtopic"
+ class="org.eclipse.help.internal.webapp.servlet.ContentServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/nav"
+ class="org.eclipse.help.internal.webapp.servlet.NavServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/livehelp"
+ class="org.eclipse.help.internal.webapp.servlet.LiveHelpServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/toc"
+ class="org.eclipse.help.internal.webapp.servlet.TocServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/tocfragment"
+ class="org.eclipse.help.internal.webapp.servlet.TocFragmentServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/index"
+ class="org.eclipse.help.internal.webapp.servlet.IndexServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/search"
+ class="org.eclipse.help.internal.webapp.servlet.SearchServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/context"
+ class="org.eclipse.help.internal.webapp.servlet.ContextServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/extension"
+ class="org.eclipse.help.internal.webapp.servlet.ExtensionServlet"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="/*.jsp"
+ class="org.eclipse.equinox.jsp.jasper.registry.JSPFactory:/"
+ httpcontext-name="help">
+ </servlet>
+ </extension>
</plugin>
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ActivitiesData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ActivitiesData.java
index d487ce913..d487ce913 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ActivitiesData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ActivitiesData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/BookmarksData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/BookmarksData.java
index 368988a65..368988a65 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/BookmarksData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/BookmarksData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/EnabledTopicUtils.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/EnabledTopicUtils.java
index 761181434..761181434 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/EnabledTopicUtils.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/EnabledTopicUtils.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/IndexData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/IndexData.java
index 14f6344e5..14f6344e5 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/IndexData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/IndexData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
index fb74116e7..fb74116e7 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LinksData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LinksData.java
index a444106bc..a444106bc 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LinksData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LinksData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/PrintData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java
index 3fdb09d6f..3fdb09d6f 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/PrintData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java
index 5fd825b31..5fd825b31 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java
index c0341c7aa..c0341c7aa 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ServletResources.java
index ff94f2243..ff94f2243 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ServletResources.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/TocData.java
index 399c04e6d..399c04e6d 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/TocData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarButton.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ToolbarButton.java
index c089a15c8..c089a15c8 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarButton.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ToolbarButton.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ToolbarData.java
index 0d251ab7c..0d251ab7c 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ToolbarData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/Topic.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/Topic.java
index ae5a25c6b..ae5a25c6b 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/Topic.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/Topic.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
index bd6152e88..bd6152e88 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/View.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/View.java
index a46235a66..a46235a66 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/View.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/View.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WebappPreferences.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WebappPreferences.java
index 52d08ae0f..52d08ae0f 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WebappPreferences.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WebappPreferences.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetData.java
index ca9f7b93e..ca9f7b93e 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java
index 014d86f0a..014d86f0a 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/BreadcrumbsFilter.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/BreadcrumbsFilter.java
index 5038c3f09..5038c3f09 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/BreadcrumbsFilter.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/BreadcrumbsFilter.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContentServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ContentServlet.java
index d139ddf23..d139ddf23 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContentServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ContentServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContextServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ContextServlet.java
index ff187fa2a..ff187fa2a 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ContextServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ContextServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ControlServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ControlServlet.java
index 2661db42d..2661db42d 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ControlServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ControlServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/CookieUtil.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/CookieUtil.java
index 08deda122..08deda122 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/CookieUtil.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/CookieUtil.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/DynamicXHTMLFilter.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/DynamicXHTMLFilter.java
index d2b7f4687..d2b7f4687 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/DynamicXHTMLFilter.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/DynamicXHTMLFilter.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
index 29cc03f29..29cc03f29 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ExtensionServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ExtensionServlet.java
index d58e92930..d58e92930 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/ExtensionServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ExtensionServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadAndBodyOutputStream.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadAndBodyOutputStream.java
index 844773832..844773832 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadAndBodyOutputStream.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadAndBodyOutputStream.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadOutputStream.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadOutputStream.java
index 9d8ba95c3..9d8ba95c3 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadOutputStream.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FilterHTMLHeadOutputStream.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
index 924dcaee3..924dcaee3 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/FramesetFilter.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java
index 205bef602..205bef602 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IFilter.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IFilter.java
index a67b55ea1..a67b55ea1 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IFilter.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IFilter.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IndexFragmentServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IndexFragmentServlet.java
index 65e3e5a60..65e3e5a60 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IndexFragmentServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IndexFragmentServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IndexServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IndexServlet.java
index 652a1c9dc..652a1c9dc 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/IndexServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/IndexServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
index 2c271ac3d..2c271ac3d 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java
index cda8c0b2e..cda8c0b2e 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
index b8576774d..b8576774d 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/NavServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/NavServlet.java
index 0e76a0ac3..0e76a0ac3 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/NavServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/NavServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/SearchServlet.java
index f12546333..f12546333 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/SearchServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocFragmentServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/TocFragmentServlet.java
index eac62534b..eac62534b 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocFragmentServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/TocFragmentServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/TocServlet.java
index efa41fec5..efa41fec5 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/TocServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/TocServlet.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java
index 09789de8a..09789de8a 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/WebappWorkingSetManager.java
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
index 6662a9246..6662a9246 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java

Back to the top