RCP work 1

8 files changed, 16 insertions, 20 deletions

diff --git a/org.eclipse.help.base/plugin.xml b/org.eclipse.help.base/plugin.xml
index fd3ad7b54..d981951f6 100644
--- a/org.eclipse.help.base/plugin.xml
+++ b/org.eclipse.help.base/plugin.xml
@@ -66,7 +66,7 @@
 <!-- Text Analyzers for search -->
    <extension
          id="org.eclipse.help.Analyzer_en"
-         point="org.eclipse.help.luceneAnalyzer">
+         point="org.eclipse.help.base.luceneAnalyzer">
       <analyzer
             locale="en"
             class="org.eclipse.help.internal.search.Analyzer_en">
@@ -74,7 +74,7 @@
    </extension>
    <extension
          id="org.eclipse.help.Analyzer_de"
-         point="org.eclipse.help.luceneAnalyzer">
+         point="org.eclipse.help.base.luceneAnalyzer">
       <analyzer
             locale="de"
             class="org.apache.lucene.analysis.de.GermanAnalyzer">
@@ -82,7 +82,7 @@
    </extension>
 <!-- Web Browsers -->
    <extension
-         point="org.eclipse.help.browser">
+         point="org.eclipse.help.base.browser">
       <browser
             name="%mozilla_adapter"
             id="org.eclipse.help.mozillaLinux">
diff --git a/org.eclipse.help.base/schema/browser.exsd b/org.eclipse.help.base/schema/browser.exsd
index 5109f89ea..40d4ffd45 100644
--- a/org.eclipse.help.base/schema/browser.exsd
+++ b/org.eclipse.help.base/schema/browser.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.help">
+<schema targetNamespace="org.eclipse.help.base">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.help" id="browser" name="Browser"/>
+         <meta.schema plugin="org.eclipse.help.base" id="browser" name="Browser"/>
       </appInfo>
       <documentation>
          For providing web browsers capable of displaying html documents at a given URL.
@@ -117,7 +117,7 @@
 
 &lt;p&gt;
 &lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.help.browser&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.help.base.browser&quot;&gt;
   &lt;browser 
    id=&quot;org.eclipse.myPlugin.myBrowserID&quot;
    factoryClass=&quot;org.eclipse.myPlugin.myPackage.MyFactoryClass&quot;
@@ -145,7 +145,7 @@ of supplying browser instances, and create browser instances that implement IBro
          <meta.section type="implementation"/>
       </appInfo>
       <documentation>
-         The &lt;samp&gt;org.eclipse.help&lt;/samp&gt; and &lt;samp&gt;org.eclipse.help.ui&lt;/samp&gt; plug-ins contain implementation of browsers on common platforms.
+         The &lt;samp&gt;org.eclipse.help.base&lt;/samp&gt; and &lt;samp&gt;org.eclipse.help.ui&lt;/samp&gt; plug-ins contain implementation of browsers on common platforms.
 Other plug-ins can provide different implementations.  In the preferences, the user can select the default
 browser from among available browsers.
       </documentation>
diff --git a/org.eclipse.help.base/schema/luceneAnalyzer.exsd b/org.eclipse.help.base/schema/luceneAnalyzer.exsd
index aac71e677..90ad4399b 100644
--- a/org.eclipse.help.base/schema/luceneAnalyzer.exsd
+++ b/org.eclipse.help.base/schema/luceneAnalyzer.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.help">
+<schema targetNamespace="org.eclipse.help.base">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.help" id="luceneAnalyzer" name="Lucene Analyzer"/>
+         <meta.schema plugin="org.eclipse.help.base" id="luceneAnalyzer" name="Lucene Analyzer"/>
       </appInfo>
       <documentation>
          This extension point is used to register text analyzers for use by help when indexing and searching documentation.
@@ -85,7 +85,7 @@ available to all locales of that language.
 
 &lt;p&gt;
 &lt;pre&gt;
- &lt;extension id=&quot;com.xyx.XYZ&quot; point=&quot;org.eclipse.help.luceneAnalyzer&quot;&gt;
+ &lt;extension id=&quot;com.xyx.XYZ&quot; point=&quot;org.eclipse.help.base.luceneAnalyzer&quot;&gt;
   &lt;analyzer locale=&quot;ll_CC&quot; class=&quot;com.xyz.ll_CCAnalyzer&quot;/&gt;
  &lt;/extension&gt;
 &lt;/pre&gt;
diff --git a/org.eclipse.help.base/schema/webapp.exsd b/org.eclipse.help.base/schema/webapp.exsd
index d59a4dfdb..f5de6c23f 100644
--- a/org.eclipse.help.base/schema/webapp.exsd
+++ b/org.eclipse.help.base/schema/webapp.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.help">
+<schema targetNamespace="org.eclipse.help.base">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.help" id="webapp" name="webapp"/>
+         <meta.schema plugin="org.eclipse.help.base" id="webapp" name="webapp"/>
       </appInfo>
       <documentation>
          Internal extension point for registering the name of the help web application plugin.
@@ -69,7 +69,7 @@
          The following is a sample usage of the webapp extension point:
 &lt;p&gt;
 &lt;samp&gt;
-&amp;lt;extension  point=&quot;org.eclipse.help.webapp&quot;&amp;gt;
+&amp;lt;extension  point=&quot;org.eclipse.help.base.webapp&quot;&amp;gt;
 &lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;    &amp;lt;webapp default=&quot;true&quot; /&amp;gt; 
 &lt;br&gt;   &amp;lt;/extension&amp;gt;
 &lt;/samp&gt;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/DefaultHelpSupport.java b/org.eclipse.help.base/src/org/eclipse/help/internal/DefaultHelpSupport.java
index 5016458e9..1a0bb364e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/DefaultHelpSupport.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/DefaultHelpSupport.java
@@ -13,7 +13,6 @@ import java.net.*;
 
 import org.eclipse.core.boot.*;
 import org.eclipse.help.*;
-import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.appserver.*;
 import org.eclipse.help.internal.context.*;
 import org.eclipse.help.internal.util.*;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/HelpApplication.java b/org.eclipse.help.base/src/org/eclipse/help/internal/HelpApplication.java
index 569795495..a95c9d693 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/HelpApplication.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/HelpApplication.java
@@ -12,10 +12,9 @@ package org.eclipse.help.internal;
 import java.io.*;
 import java.util.*;
 
-import org.eclipse.core.boot.IPlatformRunnable;
+import org.eclipse.core.boot.*;
 import org.eclipse.core.runtime.*;
-import org.eclipse.help.internal.*;
-import org.eclipse.help.internal.appserver.WebappManager;
+import org.eclipse.help.internal.appserver.*;
 
 /**
  * Help application.
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/IndexToolApplication.java b/org.eclipse.help.base/src/org/eclipse/help/internal/IndexToolApplication.java
index 25c680f50..5a1336a07 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/IndexToolApplication.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/IndexToolApplication.java
@@ -16,7 +16,6 @@ import java.util.zip.*;
 
 import org.eclipse.core.boot.*;
 import org.eclipse.core.runtime.*;
-import org.eclipse.help.internal.*;
 
 /**
  * application org.eclipse.help.indexTool
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/util/PluginVersionInfo.java b/org.eclipse.help.base/src/org/eclipse/help/internal/util/PluginVersionInfo.java
index 087e1c9de..3bdbf5fa6 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/util/PluginVersionInfo.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/util/PluginVersionInfo.java
@@ -13,8 +13,7 @@ import java.util.*;
 
 import org.eclipse.core.runtime.*;
 import org.eclipse.core.runtime.model.*;
-import org.eclipse.help.internal.HelpBasePlugin;
-import org.eclipse.help.internal.util.*;
+import org.eclipse.help.internal.*;
 /**
  * Table of plugins. Records all plugins, their version, corresponding fragments versions
  * The values are String in format: