fix extension for activities
diff --git a/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.xml b/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.xml
index 1873092..a0b8ff5 100644
--- a/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.xml
+++ b/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.xml
@@ -151,6 +151,101 @@
         <defaultEnablement
             id="org.eclipse.antDevelopment">
         </defaultEnablement>
+
+        <!-- Mylyn category bindings and default enablement -->
+        <categoryActivityBinding
+            activityId="org.eclipse.mylyn.capabilities.taskManagement"
+            categoryId="org.eclipse.galileo.tasks.Category">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.mylyn.capabilities.taskManagement">
+        </defaultEnablement>
+        <categoryActivityBinding
+            activityId="org.eclipse.mylyn.capabilities.taskFocusedInterface"
+            categoryId="org.eclipse.galileo.tasks.Category">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.mylyn.capabilities.taskFocusedInterface">
+        </defaultEnablement>
+        <categoryActivityBinding
+            activityId="org.eclipse.mylyn.capabilities.wikiText"
+            categoryId="org.eclipse.galileo.tasks.Category">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.mylyn.capabilities.wikiText">
+        </defaultEnablement>
+
+
+
+
+        <!-- WTP category bindings and default enablement -->
+        <!-- JavaScript -->
+        <categoryActivityBinding
+            activityId="org.eclipse.wtp.javascript.capabilities"
+            categoryId="org.eclipse.categories.developmentCategory">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.wtp.javascript.capabilities">
+        </defaultEnablement>
+
+        <!-- XML (XSD, DTD, XSL) -->
+        <categoryActivityBinding
+            activityId="org.eclipse.wtp.xml.capabilities"
+            categoryId="org.eclipse.categories.developmentCategory">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.wtp.xml.capabilities">
+        </defaultEnablement>
+
+        <!-- Web (HTML, CSS, XHTML) -->
+        <categoryActivityBinding
+            activityId="org.eclipse.wst.web.capabilities"
+            categoryId="org.eclipse.categories.developmentCategory">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.wtp.web.capabilities">
+        </defaultEnablement>
+
+        <!-- Java EE, Web Services -->
+        <categoryActivityBinding
+            activityId="org.eclipse.wtp.webservices.capabilities"
+            categoryId="org.eclipse.categories.developmentCategory">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.wtp.webservices.capabilities">
+        </defaultEnablement>
+        <categoryActivityBinding
+            activityId="org.eclipse.wtp.jee.capabilities"
+            categoryId="org.eclipse.categories.developmentCategory">
+        </categoryActivityBinding>
+        <defaultEnablement
+            id="org.eclipse.wtp.jee.capabilities">
+        </defaultEnablement>
+
+        <!-- DSDP-TM / RSE and Terminal category binding -->
+        <categoryActivityBinding
+            activityId="org.eclipse.rse.activity"
+            categoryId="org.eclipse.galileo.dsdp.Category"/>
+        <categoryActivityBinding
+            activityId="org.eclipse.tm.terminal.activity"
+            categoryId="org.eclipse.galileo.dsdp.Category"/>
+        <!-- DSDP-TM / RSE and Terminal enabled by default -->
+        <defaultEnablement
+            id="org.eclipse.rse.activity"/>
+        <defaultEnablement
+            id="org.eclipse.tm.terminal.activity"/>
+
+
+        <!-- Data Tooling enabled by default -->
+        <defaultEnablement
+            id="org.eclipse.datatools.capabilities.activity">
+        </defaultEnablement>
+
+        <!-- Data Tools in Development category -->
+        <categoryActivityBinding
+            activityId="org.eclipse.datatools.capabilities.activity"
+            categoryId="org.eclipse.categories.developmentCategory">
+        </categoryActivityBinding>
     </extension>
     <extension
         point="org.eclipse.ui.newWizards">
@@ -238,103 +333,6 @@
             productId="org.eclipse.epp.package.jee.product"
             triggerPointAdvisorId="org.eclipse.ui.ide.triggerPointAdvisor"/>
     </extension>
-
-    <!-- Mylyn category bindings and default enablement -->
-    <categoryActivityBinding
-        activityId="org.eclipse.mylyn.capabilities.taskManagement"
-        categoryId="org.eclipse.galileo.tasks.Category">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.mylyn.capabilities.taskManagement">
-    </defaultEnablement>
-    <categoryActivityBinding
-        activityId="org.eclipse.mylyn.capabilities.taskFocusedInterface"
-        categoryId="org.eclipse.galileo.tasks.Category">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.mylyn.capabilities.taskFocusedInterface">
-    </defaultEnablement>
-    <categoryActivityBinding
-        activityId="org.eclipse.mylyn.capabilities.wikiText"
-        categoryId="org.eclipse.galileo.tasks.Category">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.mylyn.capabilities.wikiText">
-    </defaultEnablement>
-
-
-
-
-    <!-- WTP category bindings and default enablement -->
-    <!-- JavaScript -->
-    <categoryActivityBinding
-        activityId="org.eclipse.wtp.javascript.capabilities"
-        categoryId="org.eclipse.categories.developmentCategory">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.wtp.javascript.capabilities">
-    </defaultEnablement>
-
-    <!-- XML (XSD, DTD, XSL) -->
-    <categoryActivityBinding
-        activityId="org.eclipse.wtp.xml.capabilities"
-        categoryId="org.eclipse.categories.developmentCategory">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.wtp.xml.capabilities">
-    </defaultEnablement>
-
-    <!-- Web (HTML, CSS, XHTML) -->
-    <categoryActivityBinding
-        activityId="org.eclipse.wst.web.capabilities"
-        categoryId="org.eclipse.categories.developmentCategory">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.wtp.web.capabilities">
-    </defaultEnablement>
-
-    <!-- Java EE, Web Services -->
-    <categoryActivityBinding
-        activityId="org.eclipse.wtp.webservices.capabilities"
-        categoryId="org.eclipse.categories.developmentCategory">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.wtp.webservices.capabilities">
-    </defaultEnablement>
-    <categoryActivityBinding
-        activityId="org.eclipse.wtp.jee.capabilities"
-        categoryId="org.eclipse.categories.developmentCategory">
-    </categoryActivityBinding>
-    <defaultEnablement
-        id="org.eclipse.wtp.jee.capabilities">
-    </defaultEnablement>
-
-    <!-- DSDP-TM / RSE and Terminal category binding -->
-    <categoryActivityBinding
-        activityId="org.eclipse.rse.activity"
-        categoryId="org.eclipse.galileo.dsdp.Category"/>
-    <categoryActivityBinding
-        activityId="org.eclipse.tm.terminal.activity"
-        categoryId="org.eclipse.galileo.dsdp.Category"/>
-    <!-- DSDP-TM / RSE and Terminal enabled by default -->
-    <defaultEnablement
-        id="org.eclipse.rse.activity"/>
-    <defaultEnablement
-        id="org.eclipse.tm.terminal.activity"/>
-        
-        
-    <!-- Data Tooling enabled by default -->
-    <defaultEnablement
-          id="org.eclipse.datatools.capabilities.activity">
-    </defaultEnablement>
-    
-        <!-- Data Tools in Development category -->
-    <categoryActivityBinding
-          activityId="org.eclipse.datatools.capabilities.activity"
-          categoryId="org.eclipse.categories.developmentCategory">
-    </categoryActivityBinding>        
-        
-        
     <extension
         point="org.eclipse.help.ui.searchEngine">
         <engine