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

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index b570732..a32526d 100644
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -2,8 +2,8 @@
 <?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse.externaltools"
-   name="ExternalTools Plug-in"
-   version="1.1.5"
+   name="PHP ExternalTools Plug-in"
+   version="1.1.6"
    provider-name="phpeclipse.de"
    class="net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin">
 
@@ -15,13 +15,14 @@
 
    <requires>
       <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.console"/>
       <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.ui.externaltools"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
       <import plugin="net.sourceforge.phpeclipse.ui"/>
    </requires>
 
@@ -36,6 +37,7 @@
 	<extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
 	
 <!-- Extensions -->
+<!--
 	<extension point="org.eclipse.ui.actionSets">
 		<actionSet
 			id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
@@ -46,7 +48,7 @@
 				path="additions"> 
 				<separator name="ExternalToolsGroup"/> 
 			</menu> 
-	<!--		<action
+			<action
 				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
 				label="%Action.externalTools"
 				menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
@@ -66,21 +68,22 @@
 				tooltip="%Action.externalToolsTip"
 				pulldown="true"
 				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> -->
+			</action> 
 		</actionSet>
 	</extension>
+-->
 
     <!-- Launch Configuration Extensions -->
     <extension point="org.eclipse.debug.core.launchConfigurationTypes">
     	<launchConfigurationType
-	    	id = "net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
+	    	id = "net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
     		name = "%Program.externalTools"
     		delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
     		modes = "run"
     		category = "org.eclipse.ui.externaltools">
-    	</launchConfigurationType>
+    	</launchConfigurationType> 
     	<launchConfigurationType
-	    	id = "net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
+	    	id = "net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType"
     		name = "%Program.externalTools"
     		delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
     		modes = "run"
@@ -90,20 +93,20 @@
     
     <extension point = "net.sourceforge.phpeclipse.externaltools.configurationDuplicationMaps">
     	<configurationMap
-    		sourceType="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-    		builderType="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType">
+    		sourceType="net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
+    		builderType="net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType">
     	</configurationMap>
     </extension>
     
     <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups">
 		<launchConfigurationTabGroup
 			id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program"
-			type ="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
+			type ="net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
 			class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramTabGroup">
 		</launchConfigurationTabGroup>
 		<launchConfigurationTabGroup
 			id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program.builder"
-			type ="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
+			type ="net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType"
 			class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramBuilderTabGroup">
 		</launchConfigurationTabGroup>
 	</extension>
@@ -111,12 +114,12 @@
 	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
 		<launchConfigurationTypeImage
 			id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program"
-			configTypeID="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
+			configTypeID="net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
 			icon="icons/full/obj16/external_tools.gif">
 		</launchConfigurationTypeImage>	
 		<launchConfigurationTypeImage
 			id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program.builder"
-			configTypeID="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
+			configTypeID="net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType"
 			icon="icons/full/obj16/external_tools.gif">
 		</launchConfigurationTypeImage>	
 	</extension>
@@ -242,5 +245,165 @@
 			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
 		</variable>
 	</extension>
-	
+	<extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            name="PHP External Tools"
+            category="net.sourceforge.phpeclipse.ui.preferencePage"
+            class="net.sourceforge.phpdt.externaltools.preferences.PHPExternalToolsPreferencePage"
+            id="net.sourceforge.phpdt.externaltools.preferences.PHPExternalToolsPreferencePage">
+      </page>
+    </extension>
+    
+    <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="net.sourceforge.phpeclipse.PHPPerspective">
+         <actionSet id="net.sourceforge.phpeclipse.PHPActionSet"/>
+      </perspectiveExtension>
+	  <perspectiveExtension
+           targetID="net.sourceforge.phpeclipse.PHPPerspective">
+    		  <actionSet id="net.sf.eclipsetidy.ActionSet"/>
+    	  </perspectiveExtension> 
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            label="PHP/Apache"
+            visible="false"
+            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_restart.gif"
+               tooltip="Restart Apache"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPRestartApacheAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpdt.externaltools.actions.PHPRestartApacheAction">
+         </action>
+         <action
+               label="Stop Apache"
+               icon="icons/obj16/apache_stop.gif"
+               tooltip="Stop Apache"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPStopApacheAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpdt.externaltools.actions.PHPStopApacheAction">
+         </action>
+         <action
+               label="Start Apache"
+               icon="icons/obj16/apache.gif"
+               tooltip="Start Apache"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPStartApacheAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpdt.externaltools.actions.PHPStartApacheAction">
+         </action>
+         <action
+               label="Start MySQL"
+               icon="icons/obj16/sql.gif"
+               tooltip="Start MySQL"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction">
+         </action>
+         <action
+               label="Stop XAMPP"
+               icon="icons/obj16/xampp_stop.gif"
+               tooltip="Stop XAMPP"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPStopXAMPPAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpdt.externaltools.actions.PHPStopXAMPPAction">
+         </action>
+         <action
+               label="Start XAMPP"
+               icon="icons/obj16/xampp_start.gif"
+               tooltip="Start XAMPP"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPStartXAMPPAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpdt.externaltools.actions.PHPStartXAMPPAction">
+         </action>
+      </actionSet>  
+    </extension>
+    
+    <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php"
+            id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php3"
+            id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php4"
+            id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php5"
+            id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.module"
+            id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.inc"
+            id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+         </action>
+      </objectContribution>
+    </extension>
 </plugin>