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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 9305a3a..ebe915d 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,46 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse"
-   name="%pluginName"
-   version="1.1.9"
-   provider-name="%providerName"
-   class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
-
-   <runtime>
-	  <library name="phpeclipse.jar">
-		<export name="*"/>
-	  </library>
- <!--     <library name="lib/hsqldb.jar"/> -->
- <!--     <library name="lib/xstream-1.0.2.jar" /> -->
-   </runtime>
-   <requires>
-	  <import plugin="org.eclipse.core.runtime"/>
-	  <import plugin="org.eclipse.ui"/>
-	  <import plugin="org.eclipse.ui.console"/>
-	  <import plugin="org.eclipse.core.resources"/>
-	  <import plugin="org.eclipse.search"/>
-	  <import plugin="org.eclipse.debug.ui"/>
-	  <import plugin="org.eclipse.core.filebuffers"/>
-	  <import plugin="org.eclipse.jface.text"/>
-	  <import plugin="org.eclipse.ui.workbench.texteditor"/>
-	  <import plugin="org.eclipse.ui.ide"/>
-	  <import plugin="org.eclipse.ui.views"/>
-	  <import plugin="org.eclipse.ui.editors"/>
-	  <import plugin="org.eclipse.team.core"/>
-	  <import plugin="org.eclipse.swt"/>
-	  <import plugin="org.eclipse.search"/>
-  <!--    <import plugin="net.sourceforge.phpeclipse.quantum.sql"/>  -->
-   <!--   <import plugin="com.quantum.Quantum"/>  -->
-	  <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
-	  <import plugin="net.sourceforge.phpeclipse.externaltools"/>
-	  <import plugin="net.sourceforge.phpeclipse.ui"/>
-	  <import plugin="net.sourceforge.phpeclipse.xml.ui"/>
-	  <import plugin="org.eclipse.ltk.core.refactoring"/>
-	  <import plugin="org.eclipse.ltk.ui.refactoring"/>
-   </requires>
- 
-   <extension
+<?eclipse version="3.2"?>
+<plugin>
+    <extension
 		 id="phpnature"
 		 name="%naturePHP.name"
 		 point="org.eclipse.core.resources.natures">
@@ -148,6 +109,8 @@
 	  <fileTypes type="text" extension="inc" />
 	  <fileTypes type="text" extension="phtml" />
 	  <fileTypes type="text" extension="phpt" />
+	  <fileTypes type="text" extension="html" />
+	  <fileTypes type="text" extension="htm" />
    </extension>
 
 <!-- declares a content type for PHP Source files -->
@@ -156,7 +119,7 @@
 	<content-type id="phpSource" name="%phpSourceName"
 		base-type="org.eclipse.core.runtime.text"
 		priority="high"
-		file-extensions="php,php3,php4,php5,phtml,inc,module,phpt"/>
+		file-extensions="php,php3,php4,php5,phtml,inc,module,phpt,html,htm"/>
    </extension>
 
    <extension
@@ -227,29 +190,8 @@
 			Create a new PHP project.
 		 </description>
 	  </wizard>
- <!-- 	 <wizard
-		id="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
-		name="%NewPHPClass.label"
-		class="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
-		category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-		icon="icons/ctool16/newclass_wiz.gif">
-		<description>%NewPHPClass.description</description>
-	</wizard>      -->
-<!--
-<this wizard replaces it as it works - maybe not as pretty but still>
 
 	  <wizard
-			name="%newWizardPHPProject.name"
-			icon="icons/obj16/php.gif"
-			category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-			class="net.sourceforge.phpeclipse.wizards.TempnewPHPProject"
-			project="true"
-			id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
-		 <description>
-			Create a new PHP project.
-		 </description>
-	  </wizard> -->
-	  <wizard
 			name="%newWizardPHPFile.name"
 			icon="icons/obj16/phpedit.gif"
 			category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -289,26 +231,6 @@
    </extension>
    <extension
 		 point="org.eclipse.ui.propertyPages">
-<!--      <page
-			objectClass="org.eclipse.core.resources.IProject"
-			name="%propertyPagePHPProject.name"
-			class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
-			id="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage">
-		 <filter
-			   name="nature"
-			   value="net.sourceforge.phpeclipse.phpnature">
-		 </filter>
-	  </page>
-	  <page
-			objectClass="org.eclipse.core.resources.IProject"
-			name="PHP Project Settings"
-			class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.project.PHPMiscProjectPreferences">
-		 <filter
-			   name="nature"
-			   value="net.sourceforge.phpeclipse.phpnature">
-		 </filter>
-	  </page> -->
 	  <page
          class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
          icon="icons/obj16/php.png"
@@ -353,22 +275,7 @@
 			   value="net.sourceforge.phpeclipse.phpnature">
 		 </filter>
 	  </page>
-	 <!--  <page
-			objectClass="org.eclipse.core.resources.IFile"
-			name="PHP File Settings"
-			class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
-	  </page> -->
    </extension>
-<!--   <extension
-		 point="org.eclipse.ui.views">
-	  <view
-			name="%viewPHPResources.name"
-			icon="icons/obj16/php.gif"
-			class="net.sourceforge.phpeclipse.resourcesview.PHPResourcesView"
-			id="net.sourceforge.phpeclipse.resourcesview.ViewPHPResources">
-	  </view>
-   </extension> -->
    <extension
 		 point="org.eclipse.ui.editors">
 	  <editor
@@ -383,26 +290,6 @@
 			   contentTypeId="net.sourceforge.phpeclipse.phpSource"
 			/>
 	  </editor>
- <!--     <editor
-			name="%phpEditorName"
-			default="true"
-			icon="icons/obj16/htmledit.gif"
-			extensions="htm,html,xhtml"
-			contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-			symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
-			id="net.sourceforge.phpeclipse.PHPUnitEditor">
-	  </editor> -->
-  <!--    <editor
-			name="%phpEditorName"
-			default="true"
-			icon="icons/obj16/htmledit.gif"
-			extensions="tpl"
-			contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-			symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
-			id="net.sourceforge.phpeclipse.PHPUnitEditor">
-	  </editor> -->
    </extension>
 	  <extension
 		 point="org.eclipse.ui.fontDefinitions">
@@ -461,7 +348,7 @@
 	  <specification
 			annotationType="net.sourceforge.phpdt.ui.occurrences"
 			label="%OccurrenceAnnotation.label"
-			icon="icons/full/obj16/searchm_obj.gif"
+			icon="icons/obj16/searchm_obj.gif"
 			textPreferenceKey="occurrenceIndication"
 			textPreferenceValue="false"
 			highlightPreferenceKey="occurrenceHighlighting"
@@ -567,57 +454,13 @@
 <!-- =========================================================================== -->
 <!-- PHP Editor Action Definition IDs -->
 <!-- =========================================================================== -->
-<!--   <extension
-		 point="org.eclipse.ui.actionDefinitions">
-
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
-	  </actionDefinition>
-
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.Comment">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.Format">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.edit.text.php.show.next.problem">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem">
-	  </actionDefinition>
-   </extension> -->
-<!--   <extension
-		 point="org.eclipse.ui.acceleratorSets">
-	  <acceleratorSet
-			scopeId="org.eclipse.ui.textEditorScope"
-			configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-		 <accelerator
-			   key="Ctrl+/"
-			   id="net.sourceforge.phpdt.ui.actions.comment">
-		 </accelerator>
-		 <accelerator
-			   key="Ctrl+\\"
-			   id="net.sourceforge.phpdt.ui.actions.uncomment">
-		 </accelerator>
-	  </acceleratorSet>
-   </extension> -->
 
    <extension
 		 point="org.eclipse.ui.popupMenus">
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -628,7 +471,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php3"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php3">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -639,7 +482,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php4"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php4">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -650,7 +493,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php5"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php5">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -661,7 +504,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.module"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.module">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -672,7 +515,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.inc"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.inc">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -683,7 +526,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.phtml"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.phtml">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -694,7 +537,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.html"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.html">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -705,7 +548,7 @@
 			<objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.htm"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.htm">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -716,7 +559,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.xml"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.xml">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -725,16 +568,6 @@
 		 </action>
 	  </objectContribution>
 
-  <!--    <viewerContribution
-			targetID="#PHPEditorContext"
-			id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
-		 <action
-			   label="Open Quantum SQL Table View"
-			   class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
-			   menubarPath="additions"
-			   id="net.sourceforge.phpeclipse.actions.opensqltable">
-		 </action>
-	  </viewerContribution> -->
 	  <viewerContribution
 			targetID="#PHPEditorContext"
 			id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
@@ -774,14 +607,6 @@
 				menubarPath="additions"
 				id="net.sourceforge.phpdt.ltk.ui.actions.RenameLocalVariable"/>
 	  </viewerContribution>
-  <!--    <viewerContribution
-		targetID="#PHPEditorContext"
-		id="net.sourceforge.phpdt.ltk.renamePHPIdentifier">
-		<action label="Rename PHP Identifier"
-				class="net.sourceforge.phpdt.ltk.ui.actions.RenamePHPIdentifier"
-				menubarPath="additions"
-				id="net.sourceforge.phpdt.ltk.ui.actions.RenamePHPIdentifier"/>
-	  </viewerContribution> -->
 	  <viewerContribution
 			targetID="#PHPRulerContext"
 			id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -1003,14 +828,6 @@
 			contentTypeId="net.sourceforge.phpeclipse.phpSource"
 			class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
 	  </participant>
-   <!--   <participant
-			extensions="html,xml"
-			class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant">
-	  </participant>
-	  <participant
-			extensions="tpl"
-			class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant">
-	  </participant> -->
    </extension>
    <extension
 		 id="net.sourceforge.phpeclipse.JavaDocumentFactory"
@@ -1024,12 +841,6 @@
 
    <extension
 		 point="org.eclipse.ui.preferencePages">
-   <!--     <page
-			name="PHP"
-			category="net.sourceforge.phpeclipse.ui.preferencePage"
-			class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
-			id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
-	  </page> -->
 	  <page name="PHP"
 			category="net.sourceforge.phpeclipse.ui.preferencePage"
 			class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
@@ -1041,36 +852,6 @@
 			class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
 			id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
 	  </page>
-  <!--    <page
-			name="Members Sort Order"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
-			id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
-	  </page>
-	  <page
-			name="PHP External Parser Command"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
-			id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
-	  </page>
-	 <page
-			name="Editor2"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
-			id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-	  </page>
-	  <page
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			name="PHP Project Defaults"
-			class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
-	  </page>
-	  <page
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			name="PHP Browser Preview"
-			class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
-	  </page> -->
 	  <page
 			name="%compilerOptionsPrefName"
 			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
@@ -1100,18 +881,6 @@
 			class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
 			id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
 	  </page>
-  <!--      <page
-			name="%templatePageName"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
-			id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
-	  </page>
-	  <page
-			name="Language Settings"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
-			id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-	  </page> -->
 	  <page
 			name="%spellingPrefName"
 			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
@@ -1123,111 +892,8 @@
 			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
 			class="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage"
 			id="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage">
-  <!--       <keywordReference id="org.eclipse.jdt.ui.markoccurrences"/> -->
 	  </page>
    </extension>
- <!--  <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="php,php3,php4,php5,phtml,inc,module"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%php3FileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%php4FileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%php5FileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%moduleFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%incFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%phtmlFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-  <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%htmlFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%htmFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="xhtml"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension> -->
- <!--  <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%tplFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.views">
-	  <category
-			name="%viewCategoryName"
-			id="net.sourceforge.phpeclipse.views.category">
-	  </category>
-	  <view
-			name="%phpConsoleView"
-			icon="icons/obj16/php.gif"
-			category="net.sourceforge.phpeclipse.views.category"
-			class="net.sourceforge.phpeclipse.views.PHPConsole"
-			id="net.sourceforge.phpeclipse.views.phpconsoleview">
-	  </view>
-   </extension> -->
 
 <!-- external tools -->
 <!-- extension point definitions -->
@@ -1238,39 +904,6 @@
 	<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/externaltools/full/dtool16/external_tools.gif"
-				icon="icons/externaltools/full/etool16/external_tools.gif"
-				hoverIcon="icons/externaltools/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/externaltools/full/dtool16/external_tools.gif"
-				icon="icons/externaltools/full/etool16/external_tools.gif"
-				hoverIcon="icons/externaltools/full/ctool16/external_tools.gif"
-				tooltip="%Action.externalToolsTip"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action>
-		</actionSet>
-	</extension> -->
 
 	<extension
 		point= "net.sourceforge.phpeclipse.foldingStructureProviders">
@@ -1523,12 +1156,6 @@
 			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
 			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
 	  </key>
-   <!--   <key
-			sequence=""
-			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
-			commandId="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-	  </key> -->
 	  <key
 			sequence="Ctrl+Shift+P"
 			contextId="net.sourceforge.phpdt.ui.phpEditorScope"