X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 663efab..acaff47 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -3,7 +3,7 @@
<plugin
id="net.sourceforge.phpeclipse"
name="%pluginName"
- version="1.1.2"
+ version="1.1.4"
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>
@@ -34,7 +35,8 @@
<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.core"/>
<import plugin="net.sourceforge.phpeclipse.ui"/>
@@ -140,7 +142,7 @@
</objectClass>
</enablement>
</decorator>
-</extension>
+ </extension>
<extension
point="org.eclipse.team.core.fileTypes">
@@ -190,6 +192,14 @@
</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
@@ -232,6 +242,15 @@
</perspective>
</extension>
<extension
+ point="org.eclipse.ui.perspectiveExtensions">
+ <perspectiveExtension
+ targetID="net.sourceforge.phpeclipse.PHPPerspective">
+ <actionSet
+ id="net.sourceforge.phpeclipse.PHPActionSet">
+ </actionSet>
+ </perspectiveExtension>
+ </extension>
+ <extension
point="org.eclipse.ui.newWizards">
<category
name="%newWizardCategory.name"
@@ -392,7 +411,7 @@
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"
@@ -401,92 +420,12 @@
<!-- <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"
@@ -576,11 +515,12 @@
isGoToPreviousNavigationTarget="false">
</specification>
</extension>
+
<extension
point="org.eclipse.ui.actionSets">
<actionSet
label="PHP/Apache"
- visible="true"
+ visible="false"
id="net.sourceforge.phpeclipse.PHPActionSet">
<menu
label="PHP/Apache"
@@ -625,6 +565,24 @@
toolbarPath="Normal"
id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
</action>
+ <action
+ label="Stop XAMPP"
+ icon="icons/obj16/xampp_stop.gif"
+ tooltip="Stop XAMPP"
+ class="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction"
+ menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+ toolbarPath="Normal"
+ id="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction">
+ </action>
+ <action
+ label="Start XAMPP"
+ icon="icons/obj16/xampp_start.gif"
+ tooltip="Start XAMPP"
+ class="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction"
+ menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+ toolbarPath="Normal"
+ id="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction">
+ </action>
</actionSet>
<actionSet
@@ -637,7 +595,7 @@
<!-- =========================================================================== -->
<menu
label="%SourceMenu.label"
- path="edit"
+ path="edit/editEnd"
id="net.sourceforge.phpeclipse.ui.source.menu">
<separator
name="editGroup">
@@ -650,60 +608,60 @@
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.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.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">
@@ -712,21 +670,21 @@
<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>
@@ -1427,7 +1385,7 @@
<keyBinding
string=""
scope="net.sourceforge.phpdt.ui.phpEditorScope"
- command="org.eclipse.jdt.ui.edit.text.java.show.next.problem"
+ command="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem"
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
<command
@@ -1491,7 +1449,7 @@
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>
@@ -1593,7 +1551,7 @@
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"
@@ -1601,7 +1559,7 @@
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
</extension>
-<!-- <extension
+ <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php3FileExtension"
@@ -1680,7 +1638,7 @@
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
- </extension> -->
+ </extension>
<extension
point="org.eclipse.ui.views">
<category
@@ -1694,7 +1652,7 @@
class="net.sourceforge.phpeclipse.views.PHPConsole"
id="net.sourceforge.phpeclipse.views.phpconsoleview">
</view>
- </extension>
+ </extension> -->
<!-- external tools -->