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

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index b570732..a7c61f2 100644
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -1,127 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.externaltools"
-   name="ExternalTools Plug-in"
-   version="1.1.5"
-   provider-name="phpeclipse.de"
-   class="net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin">
-
-   <runtime>
-      <library name="externaltools.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <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>
-
-
-<!-- external tools -->
-
+<?eclipse version="3.2"?>
+<plugin>
 <!-- extension point definitions -->
 	<extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/>
 	<extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/>
 	<extension-point id="directoryVariables" name="%ExtPoint.directoryVariables"/>
 	<extension-point id="fileVariables" name="%ExtPoint.fileVariables"/>
 	<extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
-	
+
 <!-- Extensions -->
-	<extension point="org.eclipse.ui.actionSets">
-		<actionSet
-			id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
-			label="%ActionSet.externalTools"
-			visible="true">
-			<menu id="org.eclipse.ui.run" 
-				label="%Menu.run" 
-				path="additions"> 
-				<separator name="ExternalToolsGroup"/> 
-			</menu> 
-	<!--		<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
-				label="%Action.externalTools"
-				menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
-				disabledIcon="icons/full/dtool16/external_tools.gif"
-				icon="icons/full/etool16/external_tools.gif"
-				hoverIcon="icons/full/ctool16/external_tools.gif"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> 
-			<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar"
-				label="%Action.externalTools"
-				toolbarPath="Normal/additions"
-				disabledIcon="icons/full/dtool16/external_tools.gif"
-				icon="icons/full/etool16/external_tools.gif"
-				hoverIcon="icons/full/ctool16/external_tools.gif"
-				tooltip="%Action.externalToolsTip"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> -->
-		</actionSet>
+
+	<!-- Launch Configuration Extensions -->
+	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
+		<launchConfigurationType
+			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
+			id = "net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType"
+			name = "%Program.externalTools"
+			delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
+			modes = "run"
+			category = "org.eclipse.ui.externaltools.builder">
+		</launchConfigurationType>
 	</extension>
 
-    <!-- Launch Configuration Extensions -->
-    <extension point="org.eclipse.debug.core.launchConfigurationTypes">
-    	<launchConfigurationType
-	    	id = "net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-    		name = "%Program.externalTools"
-    		delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
-    		modes = "run"
-    		category = "org.eclipse.ui.externaltools">
-    	</launchConfigurationType>
-    	<launchConfigurationType
-	    	id = "net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
-    		name = "%Program.externalTools"
-    		delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
-    		modes = "run"
-    		category = "org.eclipse.ui.externaltools.builder">
-    	</launchConfigurationType>
-    </extension>
-    
-    <extension point = "net.sourceforge.phpeclipse.externaltools.configurationDuplicationMaps">
-    	<configurationMap
-    		sourceType="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-    		builderType="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType">
-    	</configurationMap>
-    </extension>
-    
-    <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups">
+	<extension point = "net.sourceforge.phpeclipse.externaltools.configurationDuplicationMaps">
+		<configurationMap
+			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>
-	
+
 	<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>
 		<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>	
+		</launchConfigurationTypeImage>
 	</extension>
- 
-	<!-- Variable Extensions --> 
+
+	<!-- Variable Extensions -->
 	<extension point="net.sourceforge.phpeclipse.externaltools.fileVariables">
 		<variable
 			tag="workspace_loc"
@@ -135,7 +75,7 @@
 			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
 		</variable>
 	</extension>
-	
+
 	<extension point="net.sourceforge.phpeclipse.externaltools.argumentVariables">
 		<variable
 			tag="workspace_loc"
@@ -213,7 +153,7 @@
 			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
 		</variable>
 	</extension>
- 
+
 	<extension point="net.sourceforge.phpeclipse.externaltools.refreshVariables">
 		<variable
 			tag="workspace"
@@ -242,5 +182,171 @@
 			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
 		</variable>
 	</extension>
-	
-</plugin>
+	<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">
+	  </page>
+	  <page
+			category="net.sourceforge.phpdt.externaltools.preferences"
+			class="net.sourceforge.phpdt.externaltools.preferences.XamppPrefencePage"
+			id="net.sourceforge.phpeclipse.externaltools.xampp.preferences"
+			name="XAMPP"/>
+	  <page
+			category="net.sourceforge.phpdt.externaltools.preferences"
+			class="net.sourceforge.phpdt.externaltools.preferences.MySQLPreferencePage"
+			id="net.sourceforge.phpeclipse.externaltools.mysql.preferences"
+			name="MySQL"/>
+	  <page
+			category="net.sourceforge.phpdt.externaltools.preferences"
+			class="net.sourceforge.phpdt.externaltools.preferences.ApachePrefencePage"
+			id="net.sourceforge.phpeclipse.externaltools.apache.preferences"
+			name="Apache"/>
+	</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>
+
+	<!-- FIXME: there is too much duplication of contributions pointing to the same action. we should find a better way-->
+	  <!-- php, phpc,php3,php4,php5,phpt-->
+	<extension
+		 point="org.eclipse.ui.popupMenus">
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.php*"
+			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.phpS">
+		 <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="*.ctp"
+			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.ctp">
+		 <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="*.phtml"
+			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.phtml">
+		 <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.module">
+		 <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.inc">
+		 <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>
\ No newline at end of file