Patch from Anders Betn�- improve path mapping when remote debugging between systems...
[phpeclipse.git] / net.sourceforge.phpeclipse / plugin.xml
index 57699a0..c982430 100644 (file)
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse"
    name="%pluginName"
-   version="1.1.2"
+   version="1.1.7"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
     
@@ -11,6 +11,7 @@
       <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.swt"/>
       <import plugin="org.eclipse.search"/>
       <import plugin="org.eclipse.update.ui"/>
-      <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> 
+  <!--    <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.core"/>
       <import plugin="net.sourceforge.phpeclipse.ui"/>
       <import plugin="net.sourceforge.phpeclipse.xml.core"/>
    
   <extension
        point="org.eclipse.ui.decorators">
- <!--
        <decorator
                label="%ProblemsLabelDecorator.label"
-               state="false"
+               state="true"
                lightweight="true"
                location="BOTTOM_LEFT"
                class="net.sourceforge.phpdt.ui.ProblemsLabelDecorator"
                                </objectClass>         
                                <objectClass
                                        name="net.sourceforge.phpdt.core.IJavaElement">
-                               </objectClass>
+                               </objectClass> 
                        </or>                
                </enablement>
        </decorator>
-       -->
        <decorator
                label="%OverrideIndicatorLabelDecorator.label"
                lightweight="true"
                        </objectClass>
                </enablement>
        </decorator>    
-</extension>
+  </extension>
   
    <extension
          point="org.eclipse.team.core.fileTypes">
       </fileTypes> -->
    </extension>
    
+   <extension point="org.eclipse.core.runtime.contentTypes">
+       <!-- declares a content type for PHP Source files -->
+       <content-type id="phpSource" name="%phpSourceName" 
+               base-type="org.eclipse.core.runtime.text"
+               priority="high"
+               file-extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"/>
+   </extension>
+   
    <extension
       point="net.sourceforge.phpeclipse.phpEditorTextHovers">
    <hover
             id="net.sourceforge.phpeclipse.PHPPerspective">
       </perspective>
    </extension>
+   
    <extension
          point="org.eclipse.ui.newWizards">
       <category
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
-            extensions="php,php3,php4,php5,phtml,inc,module"
+            extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
  <!--     <editor
             name="%phpEditorName"
             default="true"
-            icon="icons/obj16/phpedit.gif"
-            extensions="php3"
-            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/phpedit.gif"
-            extensions="php4"
-            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/phpedit.gif"
-            extensions="module"
-            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/phpedit.gif"
-            extensions="php5"
-            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/phpedit.gif"
-            extensions="inc"
-            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/phpedit.gif"
-            extensions="phtml"
-            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="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="html"
-            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="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"
                isGoToPreviousNavigationTarget="false">
          </specification>
     </extension>
+    
    <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
-            label="PHP/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_restart.gif"
-               tooltip="Restart Apache"
-               class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"
-               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
-               toolbarPath="Normal"
-               id="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction">
-         </action>
-         <action
-               label="Stop Apache"
-               icon="icons/obj16/apache_stop.gif"
-               tooltip="Stop Apache"
-               class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"
-               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
-               toolbarPath="Normal"
-               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"
-               id="net.sourceforge.phpeclipse.actions.PHPStartApacheAction">
-         </action>
-         <action
-               label="Start MySQL"
-               icon="icons/obj16/sql.gif"
-               tooltip="Start MySQL"
-               class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"
-               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
-               toolbarPath="Normal"
-               id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
-         </action>
-      </actionSet>
-
-      <actionSet
             label="%CodingActionSet.label"
             description="%CodingActionSet.description"
             visible="false"
 <!-- =========================================================================== -->
          <menu
                label="%SourceMenu.label"
-               path="edit"
+               path="edit/editEnd"
                id="net.sourceforge.phpeclipse.ui.source.menu">
                <separator 
                      name="editGroup">
                definitionId="net.sourceforge.phpeclipse.phpeditor.format"
                label="%FormatAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.Format">
          </action>
          <action
                label="%ShiftLeftAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.ShiftLeft">
          </action>
          <action
                label="%ShiftRightAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
          </action>
          <action
-               definitionId="net.sourceforge.phpeclipse.remove.block.comment"
+               definitionId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
                label="%RemoveBlockCommentAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment">
          </action>
          <action
-               definitionId="net.sourceforge.phpeclipse.add.block.comment"
+               definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
                label="%AddBlockCommentAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment">
          </action> 
          <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
                label="%ToggleCommentAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.ui.actions.ToggleComment">
          </action>
          <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
                label="%UncommentAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
          </action>
          <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
                label="%CommentAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.Comment">
          </action>
 <!-- convert group -->
          <menu
                label="%ConvertLineDelimitersActions.label"
-               path="net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
+               path="edit/net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
                id="convertSubMenu">
             <separator
                   name="group1">
          <action
                label="%ConvertLineDelimitersToMacAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
                allowLabelUpdate="true"
                id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToMac">
          </action>
          <action
                label="%ConvertLineDelimitersToUNIXAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
                allowLabelUpdate="true"
                id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToUNIX">
          </action>
          <action
                label="%ConvertLineDelimitersToWindowsAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
                allowLabelUpdate="true"
                id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows">
          </action>
    
    <extension
          point="org.eclipse.ui.popupMenus">
- <!--      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
-         <action
-               label="Run PHPDocumentor"
-               class="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
-         </action>
-      </objectContribution> -->
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php"
-            id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         <action
-               label="Run External PHP Parser"
-               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php3"
-            id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         <action
-               label="Run External PHP Parser"
-               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php4"
-            id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         <action
-               label="Run External PHP Parser"
-               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php5"
-            id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         <action
-               label="Run External PHP Parser"
-               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.module"
-            id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         <action
-               label="Run External PHP Parser"
-               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.inc"
-            id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         <action
-               label="Run External PHP Parser"
-               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.phtml"
-            id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         <action
-               label="Run External PHP Parser"
-               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.externalParserAction">
-         </action>
-      </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php"
          </action>
       </objectContribution>
   
-      <viewerContribution
+  <!--    <viewerContribution  
             targetID="#PHPEditorContext"
             id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
          <action
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.actions.opensqltable">
          </action>
-      </viewerContribution>
+      </viewerContribution> -->
       <viewerContribution
             targetID="#PHPEditorContext"
             id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
                id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
          </action>
       </viewerContribution>
-      
       <viewerContribution
             targetID="#PHPRulerContext"
             id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
          </action>
       </viewerContribution>
    </extension>
-   
+   <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            label="%OpenActionSet.label"
+            description="%OpenActionSet.description"
+            visible="false"
+            id="net.sourceforge.phpeclipse.ui.A_OpenActionSet">
+         <action
+               definitionId="net.sourceforge.phpeclipse.ui.edit.text.java.open.editor"
+               label="%OpenDeclaration"
+               tooltip="%OpenDeclaration"
+               retarget="true"
+               menubarPath="navigate/open.ext" 
+               allowLabelUpdate="true"
+               id="net.sourceforge.phpeclipse.ui.actions.Open">
+         </action>
+      </actionSet>
+   </extension> 
    <extension
          point="org.eclipse.ui.editorActions">
       <editorContribution
                class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
                id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
          </action>
-      </editorContribution>
+      </editorContribution>   
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
             platform="carbon"
             string="Ctrl+/"
             scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
+            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
       <keyBinding
       
       <!-- navigate -->
       <command
+            name="%ActionDefinition.gotoNextMember.name"
+            description="%ActionDefinition.gotoNextMember.description"
+            category="org.eclipse.ui.category.navigate"
+            id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member">
+      </command>
+      <keyBinding
+            string="Ctrl+Shift+ARROW_DOWN"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <keyBinding
+            platform="carbon"
+            string="Ctrl+Shift+ARROW_DOWN"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command=""
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <keyBinding
+            platform="carbon"
+            string="Command+Shift+ARROW_DOWN"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <command
+            name="%ActionDefinition.gotoPreviousMember.name"
+            description="%ActionDefinition.gotoPreviousMember.description"
+            category="org.eclipse.ui.category.navigate"
+            id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member">
+      </command>
+      <keyBinding
+            string="Ctrl+Shift+ARROW_UP"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <keyBinding
+            platform="carbon"
+            string="Ctrl+Shift+ARROW_UP"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command=""
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <keyBinding
+            platform="carbon"
+            string="Command+Shift+ARROW_UP"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+   <!--   <keyBinding
+            string=""
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding> -->
+      <command
             name="%ActionDefinition.gotoMatchingBracket.name"
             description="%ActionDefinition.gotoMatchingBracket.description"
             category="org.eclipse.ui.category.navigate"
             command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
-      
       <command
             name="%OpenDeclaration" 
             description="%OpenDeclaration"
             scope="net.sourceforge.phpdt.ui.phpEditorScope"
             command="net.sourceforge.phpeclipse.actions.opendeclaration"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-   </extension>
+      </keyBinding> 
+   </extension>  
    <extension
          id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
          name="%javaDocumentSetupParticipant"
          name="%javaDocumentFactory"
          point="org.eclipse.core.filebuffers.documentCreation">
       <factory
-            extensions="php"
+            extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
             class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
       </factory>
    </extension>
    
    <extension
          point="org.eclipse.ui.preferencePages">
-      <page
+   <!--     <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"
+            id="net.sourceforge.phpeclipse.preferences.PHPPreferencePage">
       </page>
       <page
             name="Code Templates"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
             id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
       </page>
   <!--    <page
             name="Members Sort Order"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
             id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
-      </page> -->
+      </page> 
       <page
             name="PHP External Parser Command"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
             id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
       </page>
-<!--    <page
+     <page
             name="Editor2"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
       </page> 
       <page
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            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.preference.PHPEclipsePreferencePage"
+            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.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
             id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
       </page>
       <page
             name="%todoTaskPrefName" 
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage"
             id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
       </page>
       <page
             name="Formatter"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
             id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
       </page>
-      <page name="Editor"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
-            id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage">
-      </page>
       <page name="%codeAssistPageName"
-            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
             id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
       </page>
             <page
             name="%templatePageName"
-            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
             id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
       </page>
   <!--      <page
             name="%templatePageName"
-            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            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.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
       </page> -->
       <page 
             name="%spellingPrefName"
-            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
             id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
       </page> 
    </extension>
-   <extension
+ <!--  <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="php,php3,php4,php5,phtml,inc,module,html,htm,xhtml"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-<!--   <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> 
    <extension
          point="org.eclipse.ui.views">
       <category
             class="net.sourceforge.phpeclipse.views.PHPConsole"
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
       </view>  
-   </extension>
+   </extension> -->
 
 <!-- external tools -->
 
        <extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
        
 <!-- Extensions -->
-       <extension point="org.eclipse.ui.actionSets">
+       <!--<extension point="org.eclipse.ui.actionSets">
                <actionSet
                        id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
                        label="%ActionSet.externalTools"
                                path="additions"> 
                                <separator name="ExternalToolsGroup"/> 
                        </menu> 
-       <!--            <action
+                       <action
                                id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
                                label="%Action.externalTools"
                                menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
                                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"
-               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.configurationDuplicationMaps">
-       <configurationMap
-               sourceType="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-               builderType="net.sourceforge.phpdt.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"
-                       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"
-                       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"
-                       icon="icons/externaltools/full/obj16/external_tools.gif">
-               </launchConfigurationTypeImage> 
-               <launchConfigurationTypeImage
-                       id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program.builder"
-                       configTypeID="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
-                       icon="icons/externaltools/full/obj16/external_tools.gif">
-               </launchConfigurationTypeImage> 
-       </extension>
-
-       <!-- Variable Extensions -->
-       <extension point="net.sourceforge.phpeclipse.fileVariables">
-               <variable
-                       tag="workspace_loc"
-                       description="Expands to the workspace root's absolute file system path."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-               </variable>
-               <variable
-                       tag="resource_loc"
-                       description="Expands to the resource's absolute file system path."
-                       componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-               </variable>
-       </extension>
+       </extension> -->
        
-       <extension point="net.sourceforge.phpeclipse.argumentVariables">
-               <variable
-                       tag="workspace_loc"
-                       description="Expands to the workspace root's absolute file system path."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-               </variable>
-               <variable
-                       tag="file_loc"
-                       description="Expands to the full file name"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.FileExpander">
-               </variable>
-               <variable
-                       tag="file_url"
-                       description="Expands to an URL with the localhost preference settings"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.UrlExpander">
-               </variable>
-               <variable
-                       tag="localhost_url"
-                       description="Expands to the localhost preference settings."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.LocalhostExpander">
-               </variable>
-               <variable
-                       tag="project_loc"
-                       description="Expands to the selected resource's project absolute file system path."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander">
-               </variable>
-               <variable
-                       tag="project_path"
-                       description="Expands to the full path, relative to the workspace root, of the selected project"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectExpander">
-               </variable>
-               <variable
-                       tag="project_name"
-                       description="Expands to the name of the selected project"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectNameExpander">
-               </variable>
-               <variable
-                       tag="resource_loc"
-                       description="Expands to the resource's absolute file system path."
-                       componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-               </variable>
-               <variable
-                       tag="container_loc"
-                       description="Expands to the selected resource's containing folder absolute file system path."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander">
-               </variable>
-               <variable
-                       tag="build_type"
-                       description="Expands to the type of build"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.BuildTypeExpander">
-               </variable>
-       </extension>
-
-       <extension point="net.sourceforge.phpeclipse.directoryVariables">
-               <variable
-                       tag="workspace_loc"
-                       description="Expands to the workspace root's absolute file system path."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-               </variable>
-               <variable
-                       tag="project_loc"
-                       description="Expands to the selected resource's project absolute file system path."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander">
-               </variable>
-               <variable
-                       tag="container_loc"
-                       description="Expands to the selected resource's containing folder absolute file system path."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander">
-               </variable>
-               <variable
-                       tag="resource_loc"
-                       description="Expands to a resource's absolute file system path."
-                       componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFolderResourceComponent"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-               </variable>
-       </extension>
-
-       <extension point="net.sourceforge.phpeclipse.refreshVariables">
-               <variable
-                       tag="workspace"
-                       description="Expands to the workspace root."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-               </variable>
-               <variable
-                       tag="project"
-                       description="Expands to the project of the selected resource."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander">
-               </variable>
-               <variable
-                       tag="container"
-                       description="Expands to the folder containing the selected resource."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander">
-               </variable>
-               <variable
-                       tag="resource"
-                       description="Expands to a resource."
-                       componentClass="net.sourceforge.phpdt.externaltools.variable.ResourceComponent"
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-               </variable>
-               <variable
-                       tag="working_set"
-                       description="Expands to the group of resources in a working set."
-                       expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
-               </variable>
-       </extension>
-               <extension
+    <extension
                point= "net.sourceforge.phpeclipse.foldingStructureProviders">
                <provider
                        id="net.sourceforge.phpdt.ui.text.defaultFoldingProvider"