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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index ef209bf..0ac2e17 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.3"
+   version="1.1.5"
    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,8 +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="com.quantum.Quantum"/> -->
+  <!--    <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"/>
@@ -141,7 +142,7 @@
 			</objectClass>
 		</enablement>
 	</decorator>	
-</extension>
+  </extension>
   
    <extension
          point="org.eclipse.team.core.fileTypes">
@@ -191,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
@@ -233,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"
@@ -393,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"
@@ -402,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"
@@ -577,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"
@@ -626,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
@@ -1428,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
@@ -1492,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>
@@ -1594,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"
@@ -1602,7 +1559,7 @@
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-<!--   <extension
+   <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%php3FileExtension"