Merging code from trunk that fixes #774, this work was done by incastrix

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

diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.xml b/net.sourceforge.phpeclipse.phphelp/plugin.xml
index 900dea5..d0fca82 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/plugin.xml
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.xml
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.phphelp"
-   name="%pluginName"
-   version="1.1.9"
-   provider-name="%providerName"
-   class="net.sourceforge.phpdt.phphelp.PHPHelpPlugin">
-
-   <runtime>
-      <library name="phphelp.jar">
-      <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
-      <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
+<?eclipse version="3.2"?>
+<plugin>
    <extension
          point="org.eclipse.ui.popupMenus">
       <viewerContribution
@@ -147,51 +124,6 @@
          </action>
       </viewerContribution>
     </extension>
-    <!--
-    <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            targetID="#EditorContext"
-            id="net.sourceforge.phpdt.phphelp.actions.httpquery">
-         <menu
-                       id="httpqueryMenu"
-                       label="%HTTPQuery.label"
-                       path="rest">
-                </menu>
-                <action
-               label="Koders.com"
-               class="net.sourceforge.phpdt.httpquery.KodersAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.KodersAction">
-         </action>
-                <action
-               label="Google.com"
-               class="net.sourceforge.phpdt.httpquery.GoogleAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.GoogleAction">
-         </action>
-         <action
-               label="Localhost"
-               class="net.sourceforge.phpdt.httpquery.LocalhostAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.LocalhostAction">
-         </action>
-         <action
-               label="PHP Manual"
-               class="net.sourceforge.phpdt.httpquery.PHPHelpAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.PHPHelpAction">
-         </action>
-                <action
-               label="HTTP Query..."
-               class="net.sourceforge.phpdt.httpquery.HTTPQueryAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.HTTPQueryAction">
-         </action>
-      </viewerContribution>
-
-    </extension>
--->
 
     <extension
          point="org.eclipse.ui.commands">
@@ -214,12 +146,6 @@
             id="net.sourceforge.phpdt.httpquery.localhost">
       </command>
       <command
-            name="Localhost"
-            description="Open localhost"
-            categoryId="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpdt.httpquery.localhost">
-      </command>
-      <command
             name="Google"
             description="Open Google.com"
             categoryId="net.sourceforge.phpeclipse.ui.category.source"