From 16f429b20d9fb3880bc19be589409b333bebb321 Mon Sep 17 00:00:00 2001
From: Bartlomiej Laczkowski <bartlomiej.l@zend.com>
Date: Wed, 1 Apr 2015 15:12:21 +0200
Subject: [PATCH] ZSTD-4901 Debugger settings page comes 1st in Local Apache
 and OpenShift wizards

---
 .../org.zend.php.server.ui/plugin.xml         | 388 +++++++++++++-----
 1 file changed, 280 insertions(+), 108 deletions(-)

diff --git a/zendserver-deployment-eclipse/org.zend.php.server.ui/plugin.xml b/zendserver-deployment-eclipse/org.zend.php.server.ui/plugin.xml
index abbd1c2c..46a0d2ba 100644
--- a/zendserver-deployment-eclipse/org.zend.php.server.ui/plugin.xml
+++ b/zendserver-deployment-eclipse/org.zend.php.server.ui/plugin.xml
@@ -42,43 +42,182 @@
          </view>
       </perspectiveExtension>
    </extension>
+   <extension
+         point="org.eclipse.ui.startup">
+         <startup
+            class="org.zend.php.server.internal.ui.startup.ServersMigrationStartup"></startup>
+         <startup
+            class="org.zend.php.server.internal.ui.startup.LocalZendServerStartup"></startup>
+   </extension>
+   <extension
+         point="org.eclipse.php.debug.core.phpLaunchDelegateListener">
+      <launchDelegateListener
+            class="org.zend.php.server.internal.ui.ServerLaunchDelegateListener">
+      </launchDelegateListener>
+   </extension>
+ <extension
+         point="org.zend.php.ui.welcomeLinkListener">
+      <listener
+            class="org.zend.php.server.internal.ui.actions.LaunchServerWizard"
+            id="org.zend.php.server.internal.ui.actions.LaunchServerWizard.listener"
+            name="server">
+      </listener>
+   </extension>
+   <extension
+         point="org.eclipse.php.ui.wizardAndCompositeFragments">
+      <wizardAndCompositeFragment
+            class="org.zend.php.server.internal.ui.apache.LocalApacheFragmentFactory"
+            fragmentsGroupID="org.eclipse.php.server.ui.serverWizardAndComposite"
+            id="org.zend.php.server.ui.apache.LocalApacheFragmentFactory"
+            name="Local Apache HTTP Server Fragment">
+      </wizardAndCompositeFragment>
+   </extension>
+   <extension
+         point="org.zend.php.server.ui.actionContributions">
+      <action
+            class="org.zend.php.server.internal.ui.apache.RefreshApacheAction">
+         <serverType
+               id="org.zend.php.server.ui.types.LocalApacheType">
+         </serverType>
+      </action>
+   </extension>
    <extension
          point="org.eclipse.php.server.ui.serverTypes">
       <type
             class="org.zend.php.server.ui.types.ZendServerType"
             id="org.zend.php.server.ui.types.ZendServerType">
-            <wizardAndSettings>
+            <wizard>
                <fragment
-               id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory">
-	         </fragment>
-             <fragment
-                   id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory">
-             </fragment>
-	            <fragment id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory">
-	            </fragment>
-	            <fragment
-	                  id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory">
-	            </fragment>
-	            <fragment
-	                  id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory">
-	            </fragment>
-	            </wizardAndSettings>
+                     id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory"
+                     ordinal="1"
+                     placement="2">
+               </fragment>
+               <fragment
+                     id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                     ordinal="2"
+                     placement="1">
+               </fragment>
+               <fragment
+                     id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory"
+                     ordinal="3"
+                     placement="5">
+               </fragment>
+               <fragment
+                     id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory"
+                     ordinal="4"
+                     placement="3">
+               </fragment>
+               <fragment
+                     id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory"
+                     ordinal="5"
+                     placement="4">
+               </fragment>
+            </wizard>
             <settings>
                <fragment
-                     id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory">
+                     id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory"
+                     ordinal="1"
+                     placement="2">
                </fragment>
                <fragment
-                     id="org.zend.php.zendserver.monitor.ui.preferences.monitoringFragmentFactory">
+                     id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                     ordinal="2"
+                     placement="1">
                </fragment>
                <fragment
-                     id="org.zend.php.zendserver.deployment.debug.ui.preferences.DebugModeFragmentFactory">
+                     id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory"
+                     ordinal="3"
+                     placement="3">
                </fragment>
                <fragment
-                     id="com.zend.php.debug.internal.ui.tunneling.TunnelingFragmentFactory">
+                     id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory"
+                     ordinal="4"
+                     placement="4">
+               </fragment>
+               <fragment
+                     id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory"
+                     ordinal="5"
+                     placement="5">
+               </fragment>
+               <fragment
+                     id="org.zend.php.zendserver.monitor.ui.preferences.monitoringFragmentFactory"
+                     ordinal="6"
+                     placement="6">
+               </fragment>
+               <fragment
+                     id="org.zend.php.zendserver.deployment.debug.ui.preferences.DebugModeFragmentFactory"
+                     ordinal="7"
+                     placement="7">
+               </fragment>
+               <fragment
+                     id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory"
+                     ordinal="8"
+                     placement="8">
+               </fragment>
+               <fragment
+                     id="com.zend.php.debug.internal.ui.tunneling.TunnelingFragmentFactory"
+                     ordinal="9"
+                     placement="9">
                </fragment>
             </settings>
       </type>
    </extension>
+   <extension
+       point="org.eclipse.php.server.ui.serverTypes">
+    <type
+          class="org.zend.php.server.ui.types.LocalZendServerType"
+          id="org.zend.php.server.ui.types.LocalZendServerType">
+         <wizard>
+            <fragment
+                  id="org.zend.php.zendserver.deployment.ui.zendserver.LocalZendServerFragmentFactory"
+                  ordinal="1"
+                  placement="1">
+            </fragment>
+            <fragment
+                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                  ordinal="2"
+                  placement="2">
+            </fragment>
+         </wizard>
+       <settings>
+               <fragment
+                     id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory"
+                     ordinal="1"
+                     placement="1">
+	         </fragment>
+               <fragment
+                     id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                     ordinal="2"
+                     placement="2">
+               </fragment>
+	         <fragment
+                id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory"
+                ordinal="3"
+                placement="3">
+            </fragment>
+            <fragment
+                  id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory"
+                  ordinal="4"
+                  placement="7">
+            </fragment>
+            <fragment
+                  id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory"
+                  ordinal="5"
+                  placement="4">
+            </fragment>
+            <fragment
+                  id="org.zend.php.zendserver.monitor.ui.preferences.monitoringFragmentFactory"
+                  ordinal="6"
+                  placement="5">
+            </fragment>
+            <fragment
+                  id="org.zend.php.zendserver.deployment.debug.ui.preferences.DebugModeFragmentFactory"
+                  ordinal="7"
+                  placement="6">
+            </fragment>
+	       </settings>
+    </type>
+ </extension>
    <extension
          point="org.eclipse.php.server.ui.serverTypes">
       <type
@@ -86,49 +225,45 @@
             id="org.zend.php.server.ui.types.LocalApacheType">
          <wizard>
             <fragment
-                  id="org.zend.php.server.ui.apache.LocalApacheFragmentFactory">
+                  id="org.zend.php.server.ui.apache.LocalApacheFragmentFactory"
+                  ordinal="1"
+                  placement="1">
             </fragment>
             <fragment
-                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory">
+                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                  ordinal="2"
+                  placement="2">
             </fragment>
          </wizard>
          <settings>
                <fragment
-               id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory">
+                     id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory"
+                     ordinal="1"
+                     placement="1">
 	         </fragment>
                <fragment
-                     id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory">
+                     id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                     ordinal="2"
+                     placement="2">
                </fragment>
                <fragment
-                     id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory">
+                     id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory"
+                     ordinal="3"
+                     placement="3">
                </fragment>
 	            <fragment
-	                  id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory">
+                   id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory"
+                   ordinal="4"
+                   placement="4">
 	            </fragment>
              <fragment
-                   id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory">
+                   id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory"
+                   ordinal="5"
+                   placement="5">
              </fragment>
 	       </settings>
       </type>
    </extension>
-   <extension
-         point="org.eclipse.php.ui.wizardAndCompositeFragments">
-      <wizardAndCompositeFragment
-            class="org.zend.php.server.internal.ui.apache.LocalApacheFragmentFactory"
-            fragmentsGroupID="org.eclipse.php.server.ui.serverWizardAndComposite"
-            id="org.zend.php.server.ui.apache.LocalApacheFragmentFactory"
-            name="Local Apache HTTP Server Fragment">
-      </wizardAndCompositeFragment>
-   </extension>
-   <extension
-         point="org.zend.php.server.ui.actionContributions">
-      <action
-            class="org.zend.php.server.internal.ui.apache.RefreshApacheAction">
-         <serverType
-               id="org.zend.php.server.ui.types.LocalApacheType">
-         </serverType>
-      </action>
-   </extension>
    <extension
          point="org.eclipse.php.server.ui.serverTypes">
       <type
@@ -136,96 +271,133 @@
             id="org.zend.php.server.ui.types.OpenShiftServerType">
             <wizard>
             <fragment
-                  id="org.zend.php.zendserver.deployment.ui.preferences.OpenShiftFragmentFactory">
+                  id="org.zend.php.zendserver.deployment.ui.preferences.OpenShiftFragmentFactory"
+                  ordinal="1"
+                  placement="1">
             </fragment>
             <fragment
-                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory">
+                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                  ordinal="2"
+                  placement="2">
             </fragment>
          </wizard>
          <settings>
             <fragment
-               id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory">
+                  id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory"
+                  ordinal="1"
+                  placement="1">
 	         </fragment>
             <fragment
-                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory">
+                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                  ordinal="2"
+                  placement="2">
             </fragment>
-            <fragment id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory">
+            <fragment
+                  id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory"
+                  ordinal="3"
+                  placement="3">
             </fragment>
             <fragment
-                  id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory">
+                  id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory"
+                  ordinal="4"
+                  placement="4">
             </fragment>
             <fragment
-                  id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory">
+                  id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory"
+                  ordinal="5"
+                  placement="3">
             </fragment>
             <fragment
-                  id="org.zend.php.zendserver.monitor.ui.preferences.monitoringFragmentFactory">
+                  id="org.zend.php.zendserver.monitor.ui.preferences.monitoringFragmentFactory"
+                  ordinal="6"
+                  placement="6">
             </fragment>
             <fragment
-                  id="org.zend.php.zendserver.deployment.debug.ui.preferences.DebugModeFragmentFactory">
+                  id="org.zend.php.zendserver.deployment.debug.ui.preferences.DebugModeFragmentFactory"
+                  ordinal="7"
+                  placement="7">
             </fragment>
             <fragment
-                  id="com.zend.php.debug.internal.ui.tunneling.TunnelingFragmentFactory">
+                  id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory"
+                  ordinal="8"
+                  placement="5">
+            </fragment>
+            <fragment
+                  id="com.zend.php.debug.internal.ui.tunneling.TunnelingFragmentFactory"
+                  ordinal="9"
+                  placement="8">
             </fragment>
          </settings>
       </type>
    </extension>
-   <extension
+ <extension
        point="org.eclipse.php.server.ui.serverTypes">
     <type
-          class="org.zend.php.server.ui.types.LocalZendServerType"
-          id="org.zend.php.server.ui.types.LocalZendServerType">
+          class="org.eclipse.php.server.ui.types.BasicServerType"
+          id="org.eclipse.php.server.ui.types.BasicServerType">
+       <wizard>
+          <fragment
+                id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory"
+                ordinal="1"
+                placement="1">
+          </fragment>
+          <fragment
+                id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                ordinal="2"
+                placement="2">
+          </fragment>
+          <fragment
+                id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory"
+                ordinal="3"
+                placement="3">
+          </fragment>
+          <fragment
+                id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory"
+                ordinal="4"
+                placement="5">
+          </fragment>
+          <fragment
+                id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory"
+                ordinal="5"
+                placement="8">
+          </fragment>
+          <fragment
+                id="com.zend.php.debug.internal.ui.tunneling.TunnelingFragmentFactory"
+                ordinal="6"
+                placement="9">
+          </fragment>
+       </wizard>
        <settings>
-               <fragment
-               id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory">
-	         </fragment>
-               <fragment
-                     id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory">
-               </fragment>
-	         <fragment
-                  id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory">
-            </fragment>
-            <fragment
-            	  id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory">
-            </fragment>
-            <fragment
-                  id="org.zend.php.zendserver.monitor.ui.preferences.monitoringFragmentFactory">
-            </fragment>
-            <fragment
-                  id="org.zend.php.zendserver.deployment.debug.ui.preferences.DebugModeFragmentFactory">
-            </fragment>
-            <fragment
-                  id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory">
-            </fragment>
-	       </settings>
-         <wizard>
-            <fragment
-                  id="org.zend.php.zendserver.deployment.ui.zendserver.LocalZendServerFragmentFactory">
-            </fragment>
-            <fragment
-                  id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory">
-            </fragment>
-         </wizard>
+          <fragment
+                id="org.eclipse.php.server.ui.wizard.BasicCompositeFragmentFactory"
+                ordinal="1"
+                placement="1">
+          </fragment>
+          <fragment
+                id="org.eclipse.php.debug.ui.DebuggerCompositeFragmentFactory"
+                ordinal="2"
+                placement="2">
+          </fragment>
+          <fragment
+                id="org.eclipse.php.internal.server.ui.PathMapperFragmentFactory"
+                ordinal="3"
+                placement="3">
+          </fragment>
+          <fragment
+                id="com.zend.php.remoteproject.ui.preferences.AutomaticUploadFragmentFactory"
+                ordinal="4"
+                placement="5">
+          </fragment>
+          <fragment
+                id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory"
+                ordinal="5"
+                placement="8">
+          </fragment>
+          <fragment
+                id="com.zend.php.debug.internal.ui.tunneling.TunnelingFragmentFactory"
+                ordinal="6"
+                placement="9">
+          </fragment></settings>
     </type>
  </extension>
-   <extension
-         point="org.eclipse.ui.startup">
-         <startup
-            class="org.zend.php.server.internal.ui.startup.ServersMigrationStartup"></startup>
-         <startup
-            class="org.zend.php.server.internal.ui.startup.LocalZendServerStartup"></startup>
-   </extension>
-   <extension
-         point="org.eclipse.php.debug.core.phpLaunchDelegateListener">
-      <launchDelegateListener
-            class="org.zend.php.server.internal.ui.ServerLaunchDelegateListener">
-      </launchDelegateListener>
-   </extension>
- <extension
-         point="org.zend.php.ui.welcomeLinkListener">
-      <listener
-            class="org.zend.php.server.internal.ui.actions.LaunchServerWizard"
-            id="org.zend.php.server.internal.ui.actions.LaunchServerWizard.listener"
-            name="server">
-      </listener>
-   </extension>
 </plugin>