unified plugin name and provider, added launch configuration icon, fixed build proper...

diff --git a/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
index dcab269..06dc7ca 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Name: XDebug Core Plug-in
+Bundle-Name: XDebug Core
 Bundle-SymbolicName: net.sourceforge.phpeclipse.xdebug.core; singleton=true
 Bundle-Version: 0.0.1
 Bundle-ClassPath: core.jar
@@ -14,3 +14,4 @@ Eclipse-AutoStart: true
 Provide-Package: net.sourceforge.phpeclipse.xdebug.core,
  net.sourceforge.phpeclipse.xdebug.php.launching,
  net.sourceforge.phpeclipse.xdebug.php.model
+Bundle-Vendor: PHPeclipse.de

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
index c8acf21..1275bec 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: XDebug Ui Plug-in
+Bundle-Name: XDebug UI
 Bundle-SymbolicName: net.sourceforge.phpeclipse.xdebug.ui ; singleton:=true
 Bundle-Version: 0.0.1
 Bundle-Activator: net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPlugin
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.core.resources,
  net.sourceforge.phpeclipse.externaltools,
  net.sourceforge.phpeclipse.xdebug.core
 Eclipse-AutoStart: true
+Bundle-Vendor: PHPeclipse.de

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/build.properties b/net.sourceforge.phpeclipse.xdebug.ui/build.properties
index 34d2e4d..b0f84a5 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.ui/build.properties
+++ b/net.sourceforge.phpeclipse.xdebug.ui/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               icons/,\
+               plugin.xml
+src.includes = src/

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml b/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml
index a29c3bc..4387499 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml
@@ -2,68 +2,75 @@
 <?eclipse version="3.0"?>
 <plugin>
    <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            class="net.sourceforge.phpeclipse.xdebug.ui.php.launching.PHPTabGroup"
-            id="net.sourceforge.phpeclipse.xdebug.ui.php.launchTabGroup"
-            type="net.sourceforge.phpeclipse.xdebug.php.launch"/>
+                point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+         <launchConfigurationTabGroup
+                       class="net.sourceforge.phpeclipse.xdebug.ui.php.launching.PHPTabGroup"
+                       id="net.sourceforge.phpeclipse.xdebug.ui.php.launchTabGroup"
+                       type="net.sourceforge.phpeclipse.xdebug.php.launch"/>
    </extension>
    <extension
-         point="org.eclipse.debug.ui.debugModelPresentations">
-      <debugModelPresentation
-            class="net.sourceforge.phpeclipse.xdebug.ui.php.launching.PHPDebugModelPresentation"
-            id="net.sourceforge.phpeclipse.xdebug.php"/>
+                point="org.eclipse.debug.ui.debugModelPresentations">
+         <debugModelPresentation
+                       class="net.sourceforge.phpeclipse.xdebug.ui.php.launching.PHPDebugModelPresentation"
+                       id="net.sourceforge.phpeclipse.xdebug.php"/>
    </extension>
    <extension
-         point="org.eclipse.core.runtime.adapters">
-      <factory
-            adaptableType="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            class="net.sourceforge.phpeclipse.xdebug.ui.php.model.PHPBreakpointAdapterFactory">
-         <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
-      </factory>
+                point="org.eclipse.core.runtime.adapters">
+         <factory
+                       adaptableType="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+                       class="net.sourceforge.phpeclipse.xdebug.ui.php.model.PHPBreakpointAdapterFactory">
+                <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
+         </factory>
    </extension>
    <extension
-         point="org.eclipse.ui.editorActions">
-      <editorContribution
-            id="net.sourceforge.phpeclipse.PHPUnitEditor.BreakpointRulerActions"
-            targetID="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor">
-         <action
-               actionID="RulerDoubleClick"
-               class="net.sourceforge.phpeclipse.xdebug.ui.actions.BreakpointRulerActionDelegate"
-               id="net.sourceforge.phpeclipse.xdebug.ui.ManageBreakpointRulerActions"
-               label="Test label"
-               />
-      </editorContribution>
+                point="org.eclipse.ui.editorActions">
+         <editorContribution
+                       id="net.sourceforge.phpeclipse.PHPUnitEditor.BreakpointRulerActions"
+                       targetID="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor">
+                <action
+                          actionID="RulerDoubleClick"
+                          class="net.sourceforge.phpeclipse.xdebug.ui.actions.BreakpointRulerActionDelegate"
+                          id="net.sourceforge.phpeclipse.xdebug.ui.ManageBreakpointRulerActions"
+                          label="Test label"
+                          />
+         </editorContribution>
    </extension>
    <extension
-         point="org.eclipse.ui.contexts">
-      <context
-            id=".sourceforge.phpeclipse.debug.ui.debugging"
-            name="XDebug Context"
-            parentId="org.eclipse.debug.ui.debugging"/>
+                point="org.eclipse.ui.contexts">
+         <context
+                       id=".sourceforge.phpeclipse.debug.ui.debugging"
+                       name="XDebug Context"
+                       parentId="org.eclipse.debug.ui.debugging"/>
    </extension>
    <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            id="net.sourceforge.phpeclipse.xdebug.PHPUnitEditorPopupActions"
-            targetID="#PHPRulerContext">
-         <action
-               class="net.sourceforge.phpeclipse.xdebug.ui.actions.BreakpointRulerActionDelegate"
-               helpContextId="manage_breakpoint_action_context"
-               id="net.sourceforge.phpeclipse.xdebug.ui.action1"
-               label="Toggle Breakpoint"
-               menubarPath="debug"/>
-      </viewerContribution>
+                point="org.eclipse.ui.popupMenus">
+         <viewerContribution
+                       id="net.sourceforge.phpeclipse.xdebug.PHPUnitEditorPopupActions"
+                       targetID="#PHPRulerContext">
+                <action
+                          class="net.sourceforge.phpeclipse.xdebug.ui.actions.BreakpointRulerActionDelegate"
+                          helpContextId="manage_breakpoint_action_context"
+                          id="net.sourceforge.phpeclipse.xdebug.ui.action1"
+                          label="Toggle Breakpoint"
+                          menubarPath="debug"/>
+         </viewerContribution>
    </extension>
    <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="net.sourceforge.phpeclipse.ui.preferencePage"
-            class="net.sourceforge.phpeclipse.xdebug.ui.preference.XDebugPreferencePage"
-            id="net.sourceforge.phpeclipse.xdebug.ui.XDebugPreferencePages"
-            name="XDebug"/>
+                point="org.eclipse.ui.preferencePages">
+         <page
+                       category="net.sourceforge.phpeclipse.ui.preferencePage"
+                       class="net.sourceforge.phpeclipse.xdebug.ui.preference.XDebugPreferencePage"
+                       id="net.sourceforge.phpeclipse.xdebug.ui.XDebugPreferencePages"
+                       name="XDebug"/>
    </extension>
-   
+   <extension
+                point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+         <launchConfigurationTypeImage
+                       configTypeID="net.sourceforge.phpeclipse.xdebug.php.launch"
+                       icon="icons/obj16/xdebug.gif"
+                       id="net.sourceforge.phpeclipse.xdebug.ui.launchImage"/>
+   </extension>
+
 
 
 </plugin>