From 947e2e2b102e1146f6857de051892667e90a54be Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Tue, 23 Jul 2013 14:20:22 +0200
Subject: [PATCH] Terminal: Revert changes to local terminal features as it
 turned out that the local terminal is depending on launches to much

---
 releng/org.eclipse.tm.repo/category.xml          |  2 +-
 .../feature.xml                                  | 10 +++++-----
 .../pom.xml                                      |  2 +-
 .../feature.xml                                  | 16 +++++++++++++++-
 .../pom.xml                                      |  2 +-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/releng/org.eclipse.tm.repo/category.xml b/releng/org.eclipse.tm.repo/category.xml
index e7aa0143074..afc20e2720e 100644
--- a/releng/org.eclipse.tm.repo/category.xml
+++ b/releng/org.eclipse.tm.repo/category.xml
@@ -18,7 +18,7 @@
    <feature url="features/org.eclipse.rse.tests_3.4.100.qualifier.jar" id="org.eclipse.rse.tests" version="3.4.100.qualifier">
       <category name="tm_35_optional"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.3.200.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.3.200.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.3.100.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.3.100.qualifier">
       <category name="tm_35_optional"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_3.3.100.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.3.100.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
index 73ed3ac64b6..126af2fe90d 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.local"
       label="%featureName"
-      version="0.2.400.qualifier"
+      version="0.2.300.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -35,16 +35,16 @@
    </url>
 
    <requires>
+      <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.2.2" match="equivalent"/>
+      <import plugin="org.eclipse.tm.terminal.view" version="2.4.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.externaltools"/>
-      <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal" version="3.2.0" match="equivalent"/>
-      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables"/>
    </requires>
 
    <plugin
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
index b3df1e83817..ceacdfbd019 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local</artifactId>
-  <version>0.2.400.qualifier</version>
+  <version>0.2.300.qualifier</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
index a55b448af50..d5ae7aeeea8 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.local.sdk"
       label="%featureName"
-      version="0.3.200.qualifier"
+      version="0.3.100.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -38,10 +38,24 @@
          id="org.eclipse.tm.terminal.local"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.tm.terminal.view"
+         version="0.0.0"/>
+
    <includes
          id="org.eclipse.tm.terminal"
          version="0.0.0"/>
 
+   <requires>
+      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.externaltools"/>
+   </requires>
+
    <plugin
          id="org.eclipse.tm.terminal.local.source"
          download-size="25"
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
index ae738779dfa..124b1b2a7b1 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local.sdk</artifactId>
-  <version>0.3.200.qualifier</version>
+  <version>0.3.100.qualifier</version>
   <packaging>eclipse-feature</packaging>
 </project>