unification of bug fixes 1198893, 1404228

[phpeclipse.git] / net.sourceforge.phpeclipse.webbrowser / plugin.xml

diff --git a/net.sourceforge.phpeclipse.webbrowser/plugin.xml b/net.sourceforge.phpeclipse.webbrowser/plugin.xml
index de478d4..933c697 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/plugin.xml
+++ b/net.sourceforge.phpeclipse.webbrowser/plugin.xml
@@ -3,22 +3,21 @@
 
 <plugin id="net.sourceforge.phpeclipse.webbrowser"
   name="%pluginName"
-  version="1.1.0"
+  version="1.1.7"
   provider-name="%providerName"
   class="net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUIPlugin">
 
   <requires>
-    <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
-    <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
-    <import plugin="org.eclipse.ui" version="3.0.0" match="equivalent"/>
-    <import plugin="org.eclipse.ui.ide" version="3.0.0" match="equivalent"/>
-    <import plugin="org.eclipse.ui.editors" version="3.0.0" match="equivalent"/>
+    <import plugin="org.eclipse.core.resources" version="3.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.core.runtime" version="3.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui" version="3.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.ide" version="3.0.0" match="greaterOrEqual"/>
   </requires>
 
   <runtime>
     <library name="webbrowser.jar">
-      <export name="*"/>
-      <packages prefixes="net.sourceforge.phpeclipse.webbrowser"/>
+      <export name="net.sourceforge.phpeclipse.webbrowser.*"/>
+      <export name="net.sourceforge.phpeclipse.webbrowser.views.*"/>
     </library>
   </runtime>
 
@@ -48,14 +47,14 @@
   </extension>
 
   <extension point="org.eclipse.ui.preferencePages">
-    <page
+ <!--   <page
       id="org.eclipse.internet"
       name="%preferenceInternetTitle"
-      class="net.sourceforge.phpeclipse.webbrowser.internal.InternetPreferencePage"/>
+      class="net.sourceforge.phpeclipse.webbrowser.internal.InternetPreferencePage"/> -->
     <page
       id="net.sourceforge.phpeclipse.webbrowser.preferencePage"
       name="%preferenceWebBrowserTitle"
-      category="org.eclipse.internet"
+      category="net.sourceforge.phpeclipse.ui.preferencePage"
       class="net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserPreferencePage"/>
   </extension>
 
@@ -73,6 +72,16 @@
       locked="false"/>
     <favorite
       id="net.sourceforge.phpeclipse.webbrowser.favorite.eclipse"
+      name="Plog4U.org"
+      url="http://www.plog4u.org"
+      locked="false"/>
+    <favorite
+      id="net.sourceforge.phpeclipse.webbrowser.favorite.eclipse"
+      name="Plog4U.de"
+      url="http://www.plog4u.de"
+      locked="false"/>
+    <favorite
+      id="net.sourceforge.phpeclipse.webbrowser.favorite.eclipse"
       name="Eclipse"
       url="http://www.eclipse.org"
       locked="false"/>
@@ -87,7 +96,7 @@
       url="http://www.jsurfer.org"
       locked="false"/>
   </extension>
-  
+
   <extension point="org.eclipse.ui.editors">
     <editor id="net.sourceforge.phpeclipse.webbrowser"
       name="%viewWebBrowserTitle"
@@ -96,7 +105,7 @@
       extensions="gif,jpg,jpeg,xhtml"
       contributorClass="net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserEditorActionBarContributor"/>
   </extension>
-       
+
   <extension point="org.eclipse.ui.elementFactories">
     <factory id="net.sourceforge.phpeclipse.webbrowser.elementFactory"
        class="net.sourceforge.phpeclipse.webbrowser.WebBrowserEditorInput"/>