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

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index a32526d..f5af837 100644
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -3,27 +3,27 @@
 <plugin
    id="net.sourceforge.phpeclipse.externaltools"
    name="PHP ExternalTools Plug-in"
-   version="1.1.6"
+   version="1.1.8"
    provider-name="phpeclipse.de"
    class="net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin">
 
    <runtime>
-      <library name="externaltools.jar">
-         <export name="*"/>
-      </library>
+	  <library name="externaltools.jar">
+		 <export name="*"/>
+	  </library>
    </runtime>
 
    <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.ui"/>
+	  <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.ui"/>
    </requires>
 
 
@@ -35,7 +35,7 @@
 	<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">
@@ -43,11 +43,11 @@
 			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> 
+			<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"
@@ -57,7 +57,7 @@
 				hoverIcon="icons/full/ctool16/external_tools.gif"
 				pulldown="true"
 				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> 
+			</action>
 			<action
 				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar"
 				label="%Action.externalTools"
@@ -68,37 +68,37 @@
 				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.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>
-    
-    <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">
+	<!-- 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>
+
+	<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.phpeclipse.externaltools.ProgramLaunchConfigurationType"
@@ -110,21 +110,21 @@
 			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.phpeclipse.externaltools.ProgramLaunchConfigurationType"
 			icon="icons/full/obj16/external_tools.gif">
-		</launchConfigurationTypeImage>	
+		</launchConfigurationTypeImage>
 		<launchConfigurationTypeImage
 			id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program.builder"
 			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"
@@ -138,7 +138,7 @@
 			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
 		</variable>
 	</extension>
-	
+
 	<extension point="net.sourceforge.phpeclipse.externaltools.argumentVariables">
 		<variable
 			tag="workspace_loc"
@@ -216,7 +216,7 @@
 			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
 		</variable>
 	</extension>
- 
+
 	<extension point="net.sourceforge.phpeclipse.externaltools.refreshVariables">
 		<variable
 			tag="workspace"
@@ -246,164 +246,179 @@
 		</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>
+		 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.sf.eclipsetidy.ActionSet"/>
-    	  </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>
+		 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>