Remove timeout in serverSocket, it not required and fix compatibility with Jsun...

[phpeclipse.git] / net.sourceforge.phpeclipse.externaltools / plugin.xml

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index 6f78814..a7c61f2 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.externaltools"
-   name="PHP ExternalTools Plug-in"
-   version="1.1.7"
-   provider-name="phpeclipse.de"
-   class="net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin">
-
-   <runtime>
-         <library name="externaltools.jar">
-                <export name="*"/>
-         </library>
-   </runtime>
-
-   <requires>
-         <import plugin="org.eclipse.ui"/>
-         <import plugin="org.eclipse.ui.console"/>
-         <import plugin="org.eclipse.ui.ide"/>
-         <import plugin="org.eclipse.ui.editors"/>
-         <import plugin="org.eclipse.core.resources"/>
-         <import plugin="org.eclipse.core.runtime"/>
-         <import plugin="org.eclipse.debug.core"/>
-         <import plugin="org.eclipse.debug.ui"/>
-         <import plugin="org.eclipse.ui.externaltools"/>
-         <import plugin="net.sourceforge.phpeclipse.ui"/>
-   </requires>
-
-
-<!-- external tools -->
-
+<?eclipse version="3.2"?>
+<plugin>
 <!-- extension point definitions -->
        <extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/>
        <extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/>
@@ -37,41 +9,6 @@
        <extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
 
 <!-- Extensions -->
-<!--
-       <extension point="org.eclipse.ui.actionSets">
-               <actionSet
-                       id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
-                       label="%ActionSet.externalTools"
-                       visible="true">
-                       <menu id="org.eclipse.ui.run"
-                               label="%Menu.run"
-                               path="additions">
-                               <separator name="ExternalToolsGroup"/>
-                       </menu>
-                       <action
-                               id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
-                               label="%Action.externalTools"
-                               menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
-                               disabledIcon="icons/full/dtool16/external_tools.gif"
-                               icon="icons/full/etool16/external_tools.gif"
-                               hoverIcon="icons/full/ctool16/external_tools.gif"
-                               pulldown="true"
-                               class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-                       </action>
-                       <action
-                               id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar"
-                               label="%Action.externalTools"
-                               toolbarPath="Normal/additions"
-                               disabledIcon="icons/full/dtool16/external_tools.gif"
-                               icon="icons/full/etool16/external_tools.gif"
-                               hoverIcon="icons/full/ctool16/external_tools.gif"
-                               tooltip="%Action.externalToolsTip"
-                               pulldown="true"
-                               class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-                       </action>
-               </actionSet>
-       </extension>
--->
 
        <!-- Launch Configuration Extensions -->
        <extension point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -352,23 +289,14 @@
          </actionSet>
        </extension>
 
+       <!-- FIXME: there is too much duplication of contributions pointing to the same action. we should find a better way-->
+         <!-- php, phpc,php3,php4,php5,phpt-->
        <extension
                 point="org.eclipse.ui.popupMenus">
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
-                       nameFilter="*.php"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
-                <action
-                          label="Run External PHP Parser"
-                          class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
-                          menubarPath="additions"
-                          id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
-                </action>
-         </objectContribution>
-         <objectContribution
-                       objectClass="org.eclipse.core.resources.IFile"
-                       nameFilter="*.php3"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       nameFilter="*.php*"
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.phpS">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -378,8 +306,8 @@
          </objectContribution>
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
-                       nameFilter="*.php4"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       nameFilter="*.ctp"
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.ctp">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -389,8 +317,8 @@
          </objectContribution>
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
-                       nameFilter="*.php5"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       nameFilter="*.phtml"
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.phtml">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -401,7 +329,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.module"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.module">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -412,7 +340,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.inc"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.inc">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -421,4 +349,4 @@
                 </action>
          </objectContribution>
        </extension>
-</plugin>
+</plugin>
\ No newline at end of file