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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index a54447b..0cffe48 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -2,12 +2,14 @@
 <plugin
    id="net.sourceforge.phpeclipse"
    name="%pluginName"
-   version="1.0.3"
+   version="1.0.6"
    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"/>
@@ -49,12 +51,20 @@
       </fileTypes>
       <fileTypes
             type="text"
+            extension="phtml">
+      </fileTypes>
+      <fileTypes
+            type="text"
             extension="html">
       </fileTypes>
       <fileTypes
             type="text"
             extension="htm">
       </fileTypes>
+      <fileTypes
+            type="text"
+            extension="xml">
+      </fileTypes>
    </extension>
    <extension
          point="org.eclipse.ui.perspectives">
@@ -71,7 +81,9 @@
             name="%newWizardCategory.name"
             id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
       </category>
-      <wizard
+<!--    
+Temporarily replaced until errors can be ironed out...
+  <wizard
             name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -82,30 +94,48 @@
             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
+<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.wizardCategory"
+            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
             class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
             id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
          <description>
             Create a basic PHP file.
          </description>
       </wizard>
-   </extension> -->
+<!-- choochter's stuff -->	  
+	  <wizard
+            name="Xaraya Module"
+            icon="icons/obj16/php.gif"
+            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+            class=" com.xaraya.wizard.NewXarayaResourceWizard"
+            project="true"
+            id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard">
+         <description>
+            Create a Xaraya module.
+         </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">
+            id="net.sourceforge.phpeclipse.ProjectNatureImagePHP">
       </image>
    </extension>
    <extension
@@ -120,7 +150,7 @@
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
-      <page
+	  <page
             objectClass="net.sourceforge.phpeclipse.PHPProject"
             name="%propertyPagePHPProject.name"
             class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
@@ -131,7 +161,7 @@
          </filter>
       </page>
    </extension>
-   <extension
+<!--   <extension
          point="org.eclipse.ui.views">
       <view
             name="%viewPHPResources.name"
@@ -139,31 +169,7 @@
             class="net.sourceforge.phpeclipse.resourcesview.PHPResourcesView"
             id="net.sourceforge.phpeclipse.resourcesview.ViewPHPResources">
       </view>
-   </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> -->
    <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
@@ -180,7 +186,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"
@@ -190,7 +196,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"
@@ -210,7 +216,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"
@@ -220,36 +226,52 @@
          </action>
       </actionSet>
       <actionSet
-            label="%phpActionSet.label"
-            visible="false"
-            id="net.sourceforge.phpeclipse.phpeditor.actions.phpActionSet">
-         <menu
-               label="%php.menu.label"
-               path="edit"
-               id="net.sourceforge.phpeclipse.phpeditor.menu">
-            <separator
-                  name="editGroup">
-            </separator>
-         </menu>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
-               accelerator="Ctrl+Shift+\\"
-               label="%phpUncommentAction.label"
-               retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.phpeditor.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.actions.Uncomment">
-         </action>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
-               accelerator="Ctrl+Shift+/"
-               label="%phpCommentAction.label"
-               retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.phpeditor.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.actions.Comment">
-         </action>
-      </actionSet>
+		id="net.sourceforge.phpeclipse.ui.CodingActionSet"
+        label="%phpActionSet.label"
+		visible="false"
+		description="%CodingActionSet.description">
+		<menu
+            id="net.sourceforge.phpeclipse.ui.source.menu"
+            label="%php.menu.label"
+            path="edit">
+         	<separator name="editGroup"/>
+      	</menu>
+      	<action id="net.sourceforge.phpdt.ui.actions.Uncomment"
+      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+      		label="%phpUncommentAction.label"
+			retarget="true" />
+			
+		<action id="net.sourceforge.phpdt.ui.actions.Comment"
+      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+      		label="%phpCommentAction.label"
+			retarget="true" />
+	  </actionSet> 
    </extension>
    <extension
+         point="org.eclipse.ui.actionDefinitions">
+      <actionDefinition
+            id="net.sourceforge.phpdt.ui.actions.comment">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpdt.ui.actions.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.phpdt.ui.actions.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\\"
+               id="net.sourceforge.phpdt.ui.actions.uncomment">
+         </accelerator>
+      </acceleratorSet>
+   </extension> 
+   <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%phpEditorName"
@@ -286,6 +308,14 @@
       <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/htmledit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -293,12 +323,20 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/phpedit.gif"
+            icon="icons/obj16/htmledit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
       </editor>
+      <editor
+            name="%phpEditorName"
+            icon="icons/obj16/xmledit.gif"
+            extensions="xml"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor">
+      </editor>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
@@ -337,6 +375,28 @@
       </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"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
          <action
@@ -368,30 +428,95 @@
                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="Open PHP Browser"
+               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+               menubarPath="additions"
+               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="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>
-      </viewerContribution>
+      </objectContribution>
+       
+	  <viewerContribution 
+		id="net.sourceforge.phpdt.ui.PHPEditorPopupActions" 
+		targetID="#PHPRulerContext">
+		<action
+			id="org.eclipse.ui.texteditor.TaskRulerAction"
+			menubarPath="add"
+			label="%AddTask.label"
+			tooltip="%AddTask.tooltip"
+            helpContextId="org.eclipse.ui.AddTask_action_context"
+			class="org.eclipse.ui.texteditor.TaskRulerAction">
+		</action>
+		<action
+			id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+			menubarPath="add"
+			label="%AddBookmark.label"
+			tooltip="%AddBookmark.tooltip"
+            helpContextId="org.eclipse.ui.bookmark_action_context"
+			class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+		</action>
+  	  </viewerContribution>
+   </extension>
+   <extension point="org.eclipse.ui.editorActions">
+	<editorContribution
+		id="org.eclipse.ui.texteditor.ruler.actions"
+		targetID="net.sourceforge.phpeclipse.PHPEditor">
+
+		<action
+			id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+			actionID="RulerDoubleClick"
+			label="%Dummy.label"
+            helpContextId="org.eclipse.ui.bookmark_action_context"
+			class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+		</action>
+	</editorContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             name="PHP"
-            class="net.sourceforge.phpeclipse.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
             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">
+            class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
       </page>
+      <page
+            name="Outline"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
+      </page>
+      <page 
+            name="Templates"
+            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+			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"
+            class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
+      </page>  	  
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -418,20 +543,53 @@
       </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.documentProviders">
+      <provider
+            extensions="%htmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%htmFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%xmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
          point="org.eclipse.ui.views">
       <view
             name="%phpConsoleView"
-            icon="icons/obj16/java.gif"
+            icon="icons/obj16/php.gif"
             class="net.sourceforge.phpeclipse.views.PHPConsole"
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
       </view>
    </extension>
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="phphelp.xml"
-            primary="true">
-      </toc>
-   </extension>
 
 </plugin>