From 3fc0b9f257646a428a8c3bee29efe5af8af32998 Mon Sep 17 00:00:00 2001
From: Koen Aers <koen.aers@gmail.com>
Date: Fri, 18 Jul 2014 16:47:55 +0200
Subject: [PATCH] JBIDE-17928: Move Aesh plugins and F2 runtime plugin out of
 org.jboss.tools.forge.ext.feature and into org.jboss.tools.forge.feature

---
 .../feature.xml                               | 27 -------------------
 .../org.jboss.tools.forge.feature/feature.xml | 26 ++++++++++++++++++
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/features/org.jboss.tools.forge.ext.feature/feature.xml b/features/org.jboss.tools.forge.ext.feature/feature.xml
index 26dc7a014..d5b722e5b 100644
--- a/features/org.jboss.tools.forge.ext.feature/feature.xml
+++ b/features/org.jboss.tools.forge.ext.feature/feature.xml
@@ -18,13 +18,6 @@
       %license
    </license>
 
-   <plugin
-         id="org.jboss.tools.forge2.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.jboss.tools.forge.core.ext"
          download-size="0"
@@ -39,24 +32,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.jboss.tools.aesh.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jboss.tools.aesh.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.jboss.tools.aesh.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.jboss.tools.forge.feature/feature.xml b/features/org.jboss.tools.forge.feature/feature.xml
index 8dc5cc449..71cb5f328 100644
--- a/features/org.jboss.tools.forge.feature/feature.xml
+++ b/features/org.jboss.tools.forge.feature/feature.xml
@@ -60,4 +60,30 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.jboss.tools.aesh.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jboss.tools.aesh.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.aesh.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jboss.tools.forge2.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>