X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index dc2699f..b2b4aca 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin
-   id="PHPEclipse"
+   id="net.sourceforge.phpeclipse"
    name="%pluginName"
    version="1.0.1"
    provider-name="%providerName"
@@ -9,20 +9,76 @@
    <runtime>
       <library name="PHPEclipse.jar"/>
    </runtime>
-   <requires>
+   <requires>s
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt"/>
-      <import plugin="org.eclipse.jdt.ui"/>
+      <import plugin="org.eclipse.help"/>
+      <import plugin="org.eclipse.swt"/>
    </requires>
 
 
    <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            label="PHP/Apache"
+            description="Starting MySQL and Apache."
+            visible="true"
+            id="net.sourceforge.phpeclipse.PHPActionSet">
+         <menu
+               label="PHP/Apache"
+               id="net.sourceforge.phpeclipse.PHPMenu">
+            <separator
+                  name="phpeclipse">
+            </separator>
+         </menu>
+         <action
+               label="Restart Apache"
+               icon="icons/obj16/apache.gif"
+               tooltip="Restart Apache"
+               class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               start="true"
+               id="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction">
+         </action>
+         <action
+               label="Stop Apache"
+               icon="icons/obj16/apache.gif"
+               tooltip="Stop Apache"
+               class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               start="true"
+               id="net.sourceforge.phpeclipse.actions.PHPStopApacheAction">
+         </action>
+         <action
+               label="Start Apache"
+               icon="icons/obj16/apache.gif"
+               tooltip="Start Apache"
+               class="net.sourceforge.phpeclipse.actions.PHPStartApacheAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               start="true"
+               id="net.sourceforge.phpeclipse.actions.PHPStartApacheAction">
+         </action>
+         <action
+               label="Start MySQL"
+               icon="icons/obj16/apache.gif"
+               tooltip="Start MySQL"
+               class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               start="true"
+               id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
+         </action>
+      </actionSet>
+   </extension>
+   <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%phpEditorName"
             icon="icons/obj16/java.gif"
-            extensions="php"
+            extensions="php,php3,php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
@@ -41,8 +97,8 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-      <viewerContribution
-            targetID="#TextEditorContext"
+ <!--     <viewerContribution
+            targetID="#PHPEditorContext"
             id="net.sourceforge.phpeclipse.actions.popup.editor">
          <action
                label="PHP Help"
@@ -50,8 +106,7 @@
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.actions.editor.contexthelp">
          </action>
-         &gt;
-      </viewerContribution>
+      </viewerContribution> -->
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -69,5 +124,7 @@
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-
+   <extension point="org.eclipse.help.toc">
+      <toc file="phphelp.xml" primary="true"/>
+   </extension>
 </plugin>