move f2 ui functionality to the main forge ui plugin

plugins/org.jboss.tools.forge.ui.ext/META-INF/MANIFEST.MF

@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.jboss.tools.forge.ui.ext;singleton:=true
 Bundle-Version: 1.3.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.jboss.tools.forge.ui.ext.ForgeUIPlugin
 Bundle-Vendor: %BundleProvider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.expressions,
@@ -32,5 +31,3 @@ Require-Bundle: org.eclipse.core.expressions,
  org.jboss.tools.forge.ui;bundle-version="1.3.0",
  org.jboss.tools.forge.core;bundle-version="1.3.0",
  org.eclipse.ui.console
-Export-Package: org.jboss.tools.forge.ui.ext
-Bundle-ClassPath: .

plugins/org.jboss.tools.forge.ui.ext/build.properties

@@ -2,12 +2,5 @@ source.. = src/
 output.. = target/classes/
 bin.includes = .,\
                META-INF/,\
-               icons/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               jboss_about.png
+               plugin.properties
 src.includes = *

plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF

@@ -23,8 +23,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.subsystems.files.core;bundle-version="3.2.101",
  org.eclipse.rse.subsystems.files.local;bundle-version="2.1.200",
  org.eclipse.core.expressions;bundle-version="3.4.300",
- org.eclipse.jpt.jpa.core;bundle-version="3.2.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.eclipse.jpt.jpa.core;bundle-version="3.2.1",
+ org.jboss.tools.forge2.runtime;bundle-version="2.0.1",
+ org.jboss.tools.forge.ui.notifications;bundle-version="1.3.0",
+ org.jboss.tools.aesh.core;bundle-version="1.3.0",
+ org.jboss.tools.aesh.ui;bundle-version="1.3.0",
+ org.eclipse.jdt.ui;bundle-version="3.9.100",
+ org.eclipse.datatools.connectivity
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.jboss.tools.forge.ui.ForgeUIPlugin
 Bundle-ClassPath: .

plugins/org.jboss.tools.forge.ui/plugin.xml

@@ -28,6 +28,11 @@
 			class="org.jboss.tools.forge.ui.preferences.ForgeInstallationsPreferencePage"
 			id="org.jboss.tools.forge.runtimes">
         </page>
+        <page
+            class="org.jboss.tools.forge.ui.ext.preferences.ForgeExtPreferencesPage"
+            id="org.jboss.tools.forge.ui.ext"
+            name="Forge 2">
+       </page>
 	</extension>
 	<extension 
 			point="org.eclipse.ui.commands">
@@ -60,6 +65,10 @@
             	description="Quickly access the list of Forge commands"
             	id="org.jboss.tools.forge.ui.commandList"
             	name="Forge Command List"/>
+        <command
+               categoryId="org.jboss.tools.forge.ui"
+               id="org.jboss.tools.forge.ui.command.runForgeCommand"
+               name="Run a Forge Command" />
 	</extension>
 	<extension
 	      point="org.eclipse.ui.menus">
@@ -105,6 +114,11 @@
 			commandId="org.jboss.tools.forge.ui.commandList"
             sequence="M1+4"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+        <key
+            commandId="org.jboss.tools.forge.ui.command.runForgeCommand"
+            contextId="org.eclipse.ui.contexts.window"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+5" />
 	</extension>
     <extension
             point="org.eclipse.ui.perspectiveExtensions">
@@ -162,5 +176,15 @@
       <console
             class="org.jboss.tools.forge.ui.console.f1.ForgeConsoleImpl">
       </console>
+      <console
+            class="org.jboss.tools.forge.ui.ext.console.ForgeConsoleImpl">
+      </console>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.jboss.tools.forge.ui.ext.handlers.ForgeCommandHandler"
+            commandId="org.jboss.tools.forge.ui.command.runForgeCommand">
+      </handler>
    </extension>
 </plugin>

plugins/org.jboss.tools.forge.ui/schema/consoles.exsd

@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
 <schema targetNamespace="org.jboss.tools.forge.ui" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appinfo>
@@ -16,7 +17,7 @@
          </appinfo>
       </annotation>
       <complexType>
-         <sequence>
+         <sequence minOccurs="1" maxOccurs="unbounded">
             <element ref="console"/>
          </sequence>
          <attribute name="point" type="string" use="required">
@@ -44,4 +45,9 @@
       </complexType>
    </element>
 
+
+
+
+
+
 </schema>