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

diff --git a/net.sourceforge.phpeclipse.xdebug.core/plugin.xml b/net.sourceforge.phpeclipse.xdebug.core/plugin.xml
index 7f752ef..69af34e 100644
--- a/net.sourceforge.phpeclipse.xdebug.core/plugin.xml
+++ b/net.sourceforge.phpeclipse.xdebug.core/plugin.xml
@@ -1,44 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.xdebug.core"
-   name="Core Plug-in"
-   version="1.0.0"
-   provider-name=""
-   class="net.sourceforge.phpeclipse.xdebug.core.CorePlugin">
-
-   <runtime>
-      <library name="core.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
-      <import plugin="net.sourceforge.phpeclipse.debug.core"/>
-   </requires>
-
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="net.sourceforge.phpeclipse.xdebug.php.launching.PHPLaunchConfigurationDelegate"
+            id="net.sourceforge.phpeclipse.xdebug.php.launch"
+            modes="run, debug"
+            name="PHP XDebug Script"
+            sourceLocatorId="net.sourceforge.phpeclipse.xdebug.core.sourceLookupDirector.php"
+            sourcePathComputerId="net.sourceforge.phpeclipse.xdebug.core.sourcePathComputer.php"/>
+      <launchConfigurationType
+            delegate="net.sourceforge.phpeclipse.xdebug.php.launching.PHPRemoteLaunchConfigurationDelegate"
+            id="net.sourceforge.phpeclipse.xdebug.php.remotelaunch"
+            modes="debug"
+            name="PHP XDebug Remote Script"
+            sourceLocatorId="net.sourceforge.phpeclipse.xdebug.core.sourceLookupDirector.php"
+            sourcePathComputerId="net.sourceforge.phpeclipse.xdebug.core.sourcePathComputer.php"/>
+   </extension>
+   <extension
+         point="org.eclipse.debug.core.sourceLocators">
+      <sourceLocator
+            class="net.sourceforge.phpeclipse.xdebug.php.launching.PHPSourceLookupDirector"
+            id="net.sourceforge.phpeclipse.xdebug.core.sourceLookupDirector.php"
+            name="PHP Source Lookup Director"/>
+   </extension>
+   <extension
+         point="org.eclipse.debug.core.sourcePathComputers">
+      <sourcePathComputer
+            class="net.sourceforge.phpeclipse.xdebug.php.launching.PHPSourcePathComputerDelegate"
+            id="net.sourceforge.phpeclipse.xdebug.core.sourcePathComputer.php"/>
+   </extension>
    <extension
          point="org.eclipse.debug.core.breakpoints">
       <breakpoint
-            markerType="net.sourceforge.phpeclipse.xdebug.core.lineBreakpoint.marker"
-            class="net.sourceforge.phpeclipse.xdebug.core.XDebugLineBreakpoint"
-            id="net.sourceforge.phpeclipse.xdebug.core.lineBreakpoint">
-      </breakpoint>
+            class="net.sourceforge.phpeclipse.xdebug.php.model.XDebugLineBreakpoint"
+            id="XDebugLineBreakpoint"
+            markerType="net.sourceforge.phpeclipse.xdebug.core.XDebugLineBreakpoint"/>
    </extension>
    <extension
-         id="XDebug.lineBreakpoint.marker"
+         id="XDebugLineBreakpoint"
          point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.debug.core.lineBreakpointMarker">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
+      <persistent value="true"/>
+      <super type="org.eclipse.debug.core.lineBreakpointMarker"/>
+   
+   </extension>
+   <extension 
+   	point="org.eclipse.debug.core.watchExpressionDelegates">
+     <watchExpressionDelegate
+       debugModel="net.sourceforge.phpeclipse.xdebug.php"
+       delegateClass="net.sourceforge.phpeclipse.xdebug.php.model.XDebugWatchExpressionDelegate"/>
    </extension>
-
 </plugin>