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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index a94138f..5443171 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -24,30 +24,46 @@
       <import plugin="org.eclipse.update.ui"/>
    </requires>
 
-
    <extension
          id="phpnature"
          name="%naturePHP.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
-          class="net.sourceforge.phpeclipse.resourcesview.PHPProject">
+          class="net.sourceforge.phpdt.internal.core.JavaProject">
          </run>
       </runtime>
       <builder
           id="net.sourceforge.phpeclipse.parserbuilder">
       </builder>
    </extension>
+   
    <extension
          id="parserbuilder"
-         name="Parser Builder"
+         name="PHP Builder"
          point="org.eclipse.core.resources.builders">
       <builder hasNature="true">
-         <run
-           class="net.sourceforge.phpeclipse.builder.ParserBuilder">
+         <run  
+           class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder">
          </run>
       </builder>
    </extension>
+   <extension-point name="%phpEditorTextHoversName" id="phpEditorTextHovers" schema="schema/phpEditorTextHovers.exsd"/>
+   <!-- =================================================================================== -->
+   <!-- Extension: PHP Markers                                                             -->
+   <!-- =================================================================================== -->
+
+   <!-- Java problems -->
+
+   <extension id="problem" point="org.eclipse.core.resources.markers" name="%phpProblemName">
+	<super type="org.eclipse.core.resources.problemmarker"/>
+	<super type="org.eclipse.core.resources.textmarker"/>
+	<persistent value="true"/>
+	<attribute name="id"/>
+	<attribute name="flags"/>
+	<attribute name="arguments"/>
+   </extension>  
+
    <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes
@@ -87,6 +103,36 @@
             extension="tpl">
       </fileTypes>
    </extension>
+   
+   <extension
+      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+   <hover
+         class="net.sourceforge.phpdt.internal.ui.text.java.hover.BestMatchHover"
+         id="net.sourceforge.phpdt.ui.BestMatchHover"
+         label="%sequentialHover"
+         description="%sequentialHoverDescription">
+   </hover>
+</extension>
+
+<extension
+      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+   <hover
+         class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaSourceHover"
+         id="net.sourceforge.phpdt.ui.JavaSourceHover"
+         label="%sourceHover"
+         description="%sourceHoverDescription">
+   </hover>
+</extension>
+   <extension
+      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+   <hover
+         class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaProblemHover"
+         id="net.sourceforge.phpdt.ui.ProblemHover"
+         label="%problemHover" 
+         description="%problemHoverDescription">
+   </hover>
+   </extension>r
+
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
@@ -447,6 +493,16 @@
    
    <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"