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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 369460f..dd10e7d 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -2,20 +2,150 @@
 <plugin
    id="net.sourceforge.phpeclipse"
    name="%pluginName"
-   version="1.0.3"
+   version="1.0.4"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
 
    <runtime>
-      <library name="phpeclipse.jar"/>
+      <library name="phpeclipse.jar">
+         <export name="*"/>
+      </library>
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.apache.xerces"/>
    </requires>
 
+
+   <extension
+         id="phpnature"
+         name="%naturePHP.name"
+         point="org.eclipse.core.resources.natures">
+      <runtime>
+         <run
+               class="net.sourceforge.phpeclipse.PHPProject">
+         </run>
+      </runtime>
+   </extension>
+   <extension
+         point="org.eclipse.team.core.fileTypes">
+      <fileTypes
+            type="text"
+            extension="php">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="php3">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="php4">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="inc">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="phtml">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="html">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="htm">
+      </fileTypes>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            name="%perspectivePHP.name"
+            icon="icons/obj16/php.gif"
+            class="net.sourceforge.phpeclipse.PHPPerspectiveFactory"
+            id="net.sourceforge.phpeclipse.PHPPerspective">
+      </perspective>
+   </extension>
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <category
+            name="%newWizardCategory.name"
+            id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
+      </category>
+      <wizard
+            name="%newWizardPHPProject.name"
+            icon="icons/obj16/php.gif"
+            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+            class="net.sourceforge.phpeclipse.wizards.NewProjectCreationWizard"
+            project="true"
+            id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
+         <description>
+            Create a new PHP project.
+         </description>
+      </wizard>
+   </extension>
+<!--   <extension
+         point="org.eclipse.ui.newWizards">
+      <category
+            name="%newWizardCategory.name"
+            id="net.sourceforge.phpeclipse.wizardCategory">
+      </category>
+      <wizard
+            name="%newWizardPHPFile.name"
+            icon="icons/obj16/phpedit.gif"
+            category="net.sourceforge.phpeclipse.wizardCategory"
+            class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
+            id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
+         <description>
+            Create a basic PHP file.
+         </description>
+      </wizard>
+   </extension> -->
+   <extension
+         point="org.eclipse.ui.projectNatureImages">
+      <image
+            icon="icons/obj16/php.gif"
+            natureId="net.sourceforge.phpeclipse.phpnature"
+            id="net.sourceforge.phpeclipse..ProjectNatureImagePHP">
+      </image>
+   </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.PropertyPagePHPProject">
+         <filter
+               name="nature"
+               value="net.sourceforge.phpeclipse.phpnature">
+         </filter>
+      </page>
+	  <page
+            objectClass="net.sourceforge.phpeclipse.PHPProject"
+            name="%propertyPagePHPProject.name"
+            class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
+            id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject">
+         <filter
+               name="nature"
+               value="net.sourceforge.phpeclipse.phpnature">
+         </filter>
+      </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.actionSets">
       <actionSet
@@ -32,7 +162,7 @@
          </menu>
          <action
                label="Restart Apache"
-               icon="icons/obj16/apache.gif"
+               icon="icons/obj16/apache_restart.gif"
                tooltip="Restart Apache"
                class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
@@ -42,7 +172,7 @@
          </action>
          <action
                label="Stop Apache"
-               icon="icons/obj16/apache.gif"
+               icon="icons/obj16/apache_stop.gif"
                tooltip="Stop Apache"
                class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
@@ -62,7 +192,7 @@
          </action>
          <action
                label="Start MySQL"
-               icon="icons/obj16/apache.gif"
+               icon="icons/obj16/sql.gif"
                tooltip="Start MySQL"
                class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
@@ -72,11 +202,35 @@
          </action>
       </actionSet>
    </extension>
+<!--  <extension
+         point="org.eclipse.ui.actionDefinitions">
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.phpeditor.comment">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+      </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.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+      </acceleratorSet>
+   </extension> -->
    <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -84,7 +238,7 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php3"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -92,7 +246,7 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -100,32 +254,39 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>   
+      </editor>
+      <editor
+            name="%phpEditorName"
+            icon="icons/obj16/phpedit.gif"
+            extensions="phtml"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor">
+      </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>   
+      </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>   
+      </editor>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
-      
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php"
@@ -159,7 +320,28 @@
                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"
@@ -193,17 +375,28 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-      
-      <viewerContribution
-            targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popup.editor">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.inc"
+            id="net.sourceforge.phpeclipse.actions.popupShowAction">
          <action
-               label="PHP Help"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowContextHelp"
+               label="Open PHP Browser"
+               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.editor.contexthelp">
+               id="net.sourceforge.phpeclipse.actions.showAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.phtml"
+            id="net.sourceforge.phpeclipse.actions.popupShowAction">
+         <action
+               label="Open PHP Browser"
+               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
-      </viewerContribution>
+      </objectContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -213,11 +406,16 @@
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
       <page
-            name="PHP Editor"
+            name="Editor"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage"
-            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+            id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage">
       </page>
+      <page name="Templates"
+		id = "net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+		class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+		category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+	  </page>
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -244,6 +442,22 @@
       </provider>
    </extension>
    <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%incFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%phtmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
          point="org.eclipse.ui.views">
       <view
             name="%phpConsoleView"
@@ -252,26 +466,5 @@
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
       </view>
    </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="PHP"
-            id="net.sourceforge.phpeclipse.wizardCategory">
-      </category>
-      <wizard
-            name="PHP File"
-            icon="icons/obj16/java.gif"
-            category="net.sourceforge.phpeclipse.wizardCategory"
-            class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
-            id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="phphelp.xml"
-            primary="true">
-      </toc>
-   </extension>
 
 </plugin>